update

Fix qt_standard_project_setup for Qt 6.2 and below.

CMakeLists.txt

@@ -2,9 +2,21 @@ cmake_minimum_required(VERSION 3.20)
 
 project(FluentUI VERSION 0.1 LANGUAGES CXX)
 
-add_subdirectory(src)
+option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
-add_subdirectory(example)
+option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON)
 
-add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT)
+add_subdirectory(src)
-add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT)
+
-add_subdirectory(framelesshelper)
+if (FLUENTUI_BUILD_EXAMPLES)
+    add_subdirectory(example)
+endif ()
+
+if (FLUENTUI_BUILD_FRAMELESSHEPLER)
+    add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT)
+    add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT)
+    add_subdirectory(framelesshelper)
+endif ()
+
+message("------------------------ FluentUI ------------------------")
+message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}")
+message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}")

README.md

@@ -115,5 +115,9 @@ View more [`here`](doc/md/all_components.md)!
 
 This FluentUI library currently licensed under [MIT License](./License)
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=zhuzichu520/FluentUI&type=Date)](https://star-history.com/#zhuzichu520/FluentUI&Date)
+
 ## ⚡ Visitor count
 ![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

example/CMakeLists.txt

@@ -3,7 +3,6 @@ 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)
@@ -20,9 +19,17 @@ endif()
 file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,3,0)
+add_definitions(-DVERSION=1,3,6,2)
 
-find_package(Qt6 REQUIRED COMPONENTS Quick REQUIRED)
+find_package(Qt6 REQUIRED COMPONENTS Quick)
+
+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)
@@ -101,4 +108,6 @@ target_link_libraries(example PRIVATE
 #安装
 install(TARGETS example
     BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

example/qml/App.qml

@@ -5,7 +5,8 @@ import QtQuick.Layouts
 import FluentUI
 
 Window {
-    id:app
+    id: app
+    flags: Qt.SplashScreen
     Component.onCompleted: {
         FluApp.init(app)
         FluTheme.darkMode = FluDarkMode.System
@@ -13,7 +14,6 @@ Window {
             "/":"qrc:/example/qml/window/MainWindow.qml",
             "/about":"qrc:/example/qml/window/AboutWindow.qml",
             "/login":"qrc:/example/qml/window/LoginWindow.qml",
-            "/media":"qrc:/example/qml/window/MediaWindow.qml",
             "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
             "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
             "/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml"

example/qml/component/CodeExpander.qml

@@ -130,7 +130,10 @@ FluExpander{
                     "FluBreadcrumbBar",
                     "FluCopyableText",
                     "FluAcrylic",
-                    "FluRemoteLoader"
+                    "FluRemoteLoader",
+                    "FluMenuBar",
+                    "FluPagination",
+                    "FluRadioButtons"
                 ];
         code = code.replace(/\n/g, "<br>");
         code = code.replace(/ /g, "&nbsp;");

example/qml/global/ItemsOriginal.qml

@@ -8,16 +8,17 @@ FluObject{
     property var navigationView
 
     FluPaneItem{
+        id:item_home
+        count: 9
         title:lang.home
+        infoBadge:FluBadge{
+            count: item_home.count
+        }
         icon:FluentIcons.Home
-        //        cusIcon: Image{
-        //            anchors.centerIn: parent
-        //            source: FluTheme.dark ? "qrc:/example/res/svg/home_dark.svg" : "qrc:/example/res/svg/home.svg"
-        //            sourceSize: Qt.size(30,30)
-        //            width: 18
-        //            height: 18
-        //        }
         onTap:{
+            if(navigationView.getCurrentUrl()){
+                item_home.count = 0
+            }
             navigationView.push("qrc:/example/qml/page/T_Home.qml")
         }
     }
@@ -26,17 +27,30 @@ FluObject{
         title:lang.basic_input
         icon:FluentIcons.CheckboxComposite
         FluPaneItem{
+            id:item_buttons
+            count: 99
+            infoBadge:FluBadge{
+                count: item_buttons.count
+            }
             title:"Buttons"
             image:"qrc:/example/res/image/control/Button.png"
             recentlyUpdated:true
             desc:"A control that responds to user input and raisesa Click event."
             onTap:{
+                item_buttons.count = 0
                 navigationView.push("qrc:/example/qml/page/T_Buttons.qml")
             }
         }
         FluPaneItem{
+            id:item_text
             title:"Text"
+            count: 5
+            infoBadge:FluBadge{
+                count: item_text.count
+                color: Qt.rgba(82/255,196/255,26/255,1)
+            }
             onTap:{
+                item_text.count = 0
                 navigationView.push("qrc:/example/qml/page/T_Text.qml")
             }
         }
@@ -58,6 +72,12 @@ FluObject{
                 navigationView.push("qrc:/example/qml/page/T_CheckBox.qml")
             }
         }
+        FluPaneItem{
+            title:"RadioButton"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_RadioButton.qml")
+            }
+        }
         FluPaneItem{
             title:"ToggleSwitch"
             onTap:{
@@ -167,8 +187,15 @@ FluObject{
             }
         }
         FluPaneItem{
+            id:item_combobox
             title:"ComboBox"
+            count: 9
+            infoBadge:FluBadge{
+                count: item_combobox.count
+                color: Qt.rgba(250/255,173/255,20/255,1)
+            }
             onTap:{
+                item_combobox.count = 0
                 navigationView.push("qrc:/example/qml/page/T_ComboBox.qml")
             }
         }
@@ -231,6 +258,12 @@ FluObject{
                 navigationView.push("qrc:/example/qml/page/T_TableView.qml")
             }
         }
+        FluPaneItem{
+            title:"Pagination"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Pagination.qml")
+            }
+        }
         FluPaneItem{
             title:"MultiWindow"
             onTap:{
@@ -278,28 +311,19 @@ FluObject{
         }
     }
 
-    FluPaneItemExpander{
-        title:lang.media
-        icon:FluentIcons.Media
-        FluPaneItem{
-            title:"MediaPlayer"
-            image:"qrc:/example/res/image/control/MediaPlayerElement.png"
-            recentlyAdded:true
-            order:0
-            desc:"A control to display video and image content."
-            onTap:{
-                navigationView.push("qrc:/example/qml/page/T_MediaPlayer.qml")
-            }
-        }
-
-    }
-
     FluPaneItemExpander{
         title:lang.other
         icon:FluentIcons.Shop
         FluPaneItem{
+            id:item_other
             title:"RemoteLoader"
+            count: 99
+            infoBadge:FluBadge{
+                count: item_other.count
+                color: Qt.rgba(82/255,196/255,26/255,1)
+            }
             onTap:{
+                item_other.count = 0
                 navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml")
             }
         }

example/qml/page/T_Acrylic.qml

@@ -58,6 +58,7 @@ FluScrollablePage{
         width: 100
         height: 100
         anchors.centerIn: parent
+    }
 }'
     }
 

example/qml/page/T_Badge.qml

@@ -33,6 +33,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:0
                     }
                 }
@@ -43,6 +45,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:5
                     }
                 }
@@ -52,6 +56,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:50
                     }
                 }
@@ -61,6 +67,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:100
                     }
                 }
@@ -70,6 +78,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         isDot:true
                     }
                 }
@@ -79,6 +89,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:99
                         color: Qt.rgba(250/255,173/255,20/255,1)
                     }
@@ -89,6 +101,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:99
                         color: Qt.rgba(82/255,196/255,26/255,1)
                     }

example/qml/page/T_Buttons.qml

@@ -210,20 +210,21 @@ FluScrollablePage{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            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"
+                onClicked: {
+                    console.debug(parent.height)
                 }
-            ]
+            }
         }
         FluToggleSwitch{
             id:drop_down_button_switch
@@ -261,24 +262,23 @@ FluScrollablePage{
         height: 100
         paddings: 10
         Layout.topMargin: 20
-        ColumnLayout{
+        FluRadioButtons{
             spacing: 8
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            Repeater{
+            FluRadioButton{
-                id:repeater
+                disabled:radio_button_switch.checked
-                property int selecIndex : 0
+                text:"Radio Button_1"
-                model: 3
+            }
-                delegate:  FluRadioButton{
+            FluRadioButton{
-                    checked : repeater.selecIndex===index
+                disabled:radio_button_switch.checked
-                    disabled:radio_button_switch.checked
+                text:"Radio Button_2"
-                    text:"Radio Button_"+index
+            }
-                    clickListener:function(){
+            FluRadioButton{
-                        repeater.selecIndex = index
+                disabled:radio_button_switch.checked
-                    }
+                text:"Radio Button_3"
-                }
             }
         }
         FluToggleSwitch{

example/qml/page/T_CheckBox.qml

@@ -22,7 +22,12 @@ FluScrollablePage{
             }
             FluCheckBox{
                 disabled: check_box_switch.checked
-                text:"Text"
+                text:"Right"
+            }
+            FluCheckBox{
+                disabled: check_box_switch.checked
+                text:"Left"
+                textRight: false
             }
         }
         FluToggleSwitch{

example/qml/page/T_ComboBox.qml

@@ -28,10 +28,6 @@ FluScrollablePage{
                     ListElement { text: "Apple" }
                     ListElement { text: "Coconut" }
                 }
-                onAccepted: {
-                    if (find(editText) === -1)
-                        model_1.append({text: editText})
-                }
             }
         }
     }

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_Expander.qml

@@ -27,7 +27,7 @@ FluScrollablePage{
                 Layout.topMargin: 20
                 Item{
                     anchors.fill: parent
-                    ColumnLayout{
+                    FluRadioButtons{
                         spacing: 8
                         anchors{
                             top: parent.top
@@ -35,17 +35,14 @@ FluScrollablePage{
                             topMargin: 15
                             leftMargin: 15
                         }
-                        Repeater{
+                        FluRadioButton{
-                            id:repeater
+                            text:"Radio Button_1"
-                            property int selecIndex : 0
+                        }
-                            model: 3
+                        FluRadioButton{
-                            delegate:  FluRadioButton{
+                            text:"Radio Button_2"
-                                checked : repeater.selecIndex===index
+                        }
-                                text:"Radio Button_"+index
+                        FluRadioButton{
-                                clickListener:function() {
+                            text:"Radio Button_3"
-                                    repeater.selecIndex = index
-                                }
-                            }
                         }
                     }
                 }

example/qml/page/T_Home.qml

@@ -17,7 +17,6 @@ FluScrollablePage{
             desc:"The latest FluentUI controls and styles for your applications."
             url:"https://github.com/zhuzichu520/FluentUI"
         }
-
     }
 
     Item{

example/qml/page/T_MediaPlayer.qml

@@ -1,62 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Window
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"MediaPlayer"
-
-    onVisibleChanged: {
-        if(visible){
-            player.play()
-        }else{
-            player.pause()
-        }
-    }
-    FluArea{
-        Layout.fillWidth: true
-        height: 320
-        Layout.topMargin: 20
-        paddings: 10
-        ColumnLayout{
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left:parent.left
-            }
-            FluMediaPlayer{
-                id:player
-                source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        Layout.topMargin: -1
-        code:'FluMediaPlayer{
-    id:player
-    source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-}
-'
-    }
-    FluArea{
-        Layout.fillWidth: true
-        height: 68
-        Layout.topMargin: 20
-        paddings: 10
-        FluButton{
-            text:"跳转到视频播放器窗口"
-            anchors.verticalCenter: parent.verticalCenter
-            onClicked:{
-                FluApp.navigate("/media",{source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"})
-            }
-        }
-    }
-
-
-
-
-}
-

example/qml/page/T_Menu.qml

@@ -9,6 +9,36 @@ FluScrollablePage{
 
     title:"Menu"
 
+    FluMenu {
+        id:menu
+        title: qsTr("File")
+        Action { text: qsTr("New...")}
+        Action { text: qsTr("Open...") }
+        Action { text: qsTr("Save") }
+        FluMenuSeparator { }
+        Action {
+            text: qsTr("Quit")
+            onTriggered: {
+                showError("Quit")
+            }
+        }
+        Action {
+            text: qsTr("Disable")
+            enabled:false
+            onTriggered: {
+                showError("Disable")
+            }
+        }
+        FluMenuSeparator { }
+        Action { text: qsTr("Check");checkable: true;checked: true}
+        FluMenu{
+            title: "Save As..."
+            Action { text: qsTr("Doc") }
+            Action { text: qsTr("PDF") }
+        }
+    }
+
+
     FluArea{
         Layout.fillWidth: true
         height: 100
@@ -22,28 +52,19 @@ FluScrollablePage{
                 left:parent.left
             }
 
+            FluText{
+                text:"Menu"
+            }
+
             FluButton{
-                text:"左击菜单"
+                text:"Show Menu Popup"
                 Layout.topMargin: 20
                 onClicked:{
                     menu.popup()
                 }
             }
 
-            FluButton{
+
-                text:"右击菜单"
-                Layout.topMargin: 20
-                onClicked: {
-                    showSuccess("请按鼠标右击")
-                }
-                MouseArea{
-                    anchors.fill: parent
-                    acceptedButtons: Qt.RightButton
-                    onClicked: {
-                        menu.popup()
-                    }
-                }
-            }
         }
     }
 
@@ -69,20 +90,78 @@ menu.popup()
 '
     }
 
-    FluMenu{
+
-        id:menu
+    FluArea{
-        FluMenuItem{
+        Layout.fillWidth: true
-            text:"删除"
+        height: 100
-            onClicked: {
+        paddings: 10
-                showError("删除")
+        Layout.topMargin: 20
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
             }
-        }
+
-        FluMenuItem{
+            FluText{
-            text:"修改"
+                text:"MenuBar"
-            onClicked: {
-                showInfo("修改")
             }
+
+            FluMenuBar {
+                id:menu_bar
+                FluMenu {
+                    title: qsTr("File")
+                    Action { text: qsTr("New...") }
+                    Action { text: qsTr("Open...") }
+                    Action { text: qsTr("Save") }
+                    FluMenuSeparator { }
+                    Action { text: qsTr("Quit") }
+                    Action {
+                        text: qsTr("Disable")
+                        enabled:false
+                    }
+                    FluMenu{
+                        title: "Save As..."
+                        Action { text: qsTr("Doc") }
+                        Action { text: qsTr("PDF") }
+                    }
+                }
+                FluMenu {
+                    title: qsTr("Edit")
+                    Action { text: qsTr("Cut") }
+                    Action { text: qsTr("Copy") }
+                    Action { text: qsTr("Paste") }
+                }
+                FluMenu {
+                    title: qsTr("Help")
+                    Action { text: qsTr("About") }
+                }
+            }
+
         }
     }
 
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluMenuBar{
+    id:menu
+    FluMenu:{
+        title:"File"
+        Action { text: qsTr("New...") }
+    }
+    FluMenu:{
+        title:"Edit"
+        Action { text: qsTr("Cut") }
+        Action { text: qsTr("Copy") }
+        Action { text: qsTr("Paste") }
+    }
+}
+menu.popup()
+'
+    }
+
+
+
+
 }

example/qml/page/T_Pagination.qml

@@ -0,0 +1,49 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import "qrc:///example/qml/component"
+import FluentUI
+
+FluScrollablePage{
+
+    title:"Pagination"
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 200
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            spacing: 20
+            anchors.verticalCenter: parent.verticalCenter
+            FluPagination{
+                pageCurrent: 1
+                pageButtonCount: 5
+                itemCount: 5000
+            }
+            FluPagination{
+                pageCurrent: 2
+                itemCount: 5000
+                pageButtonCount: 7
+            }
+            FluPagination{
+                pageCurrent: 3
+                itemCount: 5000
+                pageButtonCount: 9
+            }
+        }
+
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluPagination{
+    pageCurrent: 1
+    itemCount: 1000
+    pageButtonCount: 9
+}'
+    }
+
+
+}

example/qml/page/T_Progress.qml

@@ -33,10 +33,13 @@ FluScrollablePage{
                 indeterminate: false
             }
             FluSlider{
-                value:50
                 onValueChanged:{
-                    progress_bar.progress = value/100
+                    var progress = value/100
-                    progress_ring.progress = value/100
+                    progress_bar.progress = progress
+                    progress_ring.progress = progress
+                }
+                Component.onCompleted: {
+                    value = 50
                 }
             }
         }

example/qml/page/T_RadioButton.qml

@@ -0,0 +1,101 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"RadioButton"
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+        Row{
+            spacing: 30
+            anchors.verticalCenter: parent.verticalCenter
+            FluRadioButton{
+                disabled: radio_button_switch.checked
+            }
+            FluRadioButton{
+                disabled: radio_button_switch.checked
+                text:"Right"
+            }
+            FluRadioButton{
+                disabled: radio_button_switch.checked
+                text:"Left"
+                textRight: false
+            }
+        }
+        FluToggleSwitch{
+            id:radio_button_switch
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text:"Disabled"
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluRadioButton{
+    text:"Text"
+}'
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
+        Layout.topMargin: 20
+        FluRadioButtons{
+            spacing: 8
+            anchors.verticalCenter: parent.verticalCenter
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluRadioButton{
+                disabled: radio_button_switch2.checked
+                text:"Radio Button_1"
+            }
+            FluRadioButton{
+                disabled: radio_button_switch2.checked
+                text:"Radio Button_2"
+            }
+            FluRadioButton{
+                disabled: radio_button_switch2.checked
+                text:"Radio Button_3"
+            }
+        }
+        FluToggleSwitch{
+            id:radio_button_switch2
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text:"Disabled"
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluRadioButtons{
+    spacing: 8
+    FluRadioButton{
+        text:"Radio Button_1"
+    }
+    FluRadioButton{
+        text:"Radio Button_2"
+    }
+    FluRadioButton{
+        text:"Radio Button_3"
+    }
+}'
+    }
+
+}

example/qml/page/T_RemoteLoader.qml

@@ -6,7 +6,7 @@ import FluentUI
 import "qrc:///example/qml/component"
 
 FluRemoteLoader{
-    property int pageMode: FluNavigationView.Standard
+    property int pageMode: FluNavigationView.SingleTop
     property string url: ''
     source: "https://zhu-zichu.gitee.io/T_RemoteLoader.qml"
 }

example/qml/page/T_Settings.qml

@@ -13,11 +13,11 @@ FluScrollablePage{
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 136
+        height: 128
         paddings: 10
 
         ColumnLayout{
-            spacing: 10
+            spacing: 5
             anchors{
                 top: parent.top
                 left: parent.left
@@ -43,16 +43,15 @@ FluScrollablePage{
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 168
+        height: 160
         paddings: 10
 
         ColumnLayout{
-            spacing: 10
+            spacing: 5
             anchors{
                 top: parent.top
                 left: parent.left
             }
-
             FluText{
                 text:lang.navigation_view_display_mode
                 font: FluTextStyle.BodyStrong

example/qml/page/T_Slider.qml

@@ -15,7 +15,6 @@ FluScrollablePage{
         paddings: 10
         Layout.topMargin: 20
         FluSlider{
-            value: 50
             anchors.verticalCenter: parent.verticalCenter
         }
     }
@@ -27,17 +26,14 @@ FluScrollablePage{
 }'
     }
 
-
     FluArea{
         Layout.fillWidth: true
         height: 200
         paddings: 10
         Layout.topMargin: 20
         FluSlider{
-            value: 50
+            orientation: Qt.Vertical
-            vertical:true
             anchors.left: parent.left
-            anchors.leftMargin: 20
             anchors.verticalCenter: parent.verticalCenter
         }
     }
@@ -45,7 +41,7 @@ FluScrollablePage{
         Layout.fillWidth: true
         Layout.topMargin: -1
         code:'FluSlider{
-    vertical:true
+    orientation: Qt.Vertical
     value:50
 }'
     }

example/qml/page/T_StatusView.qml

@@ -21,36 +21,34 @@ FluScrollablePage{
                 id:btn_status_mode
                 Layout.preferredWidth: 140
                 text:"Loading"
-                items:[
+                FluMenuItem{
-                    FluMenuItem{
+                    text:"Loading"
-                        text:"Loading"
+                    onClicked: {
-                        onClicked: {
+                        btn_status_mode.text = text
-                            btn_status_mode.text = text
+                        status_view.statusMode = FluStatusView.Loading
-                            status_view.statusMode = FluStatusView.Loading
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Empty"
-                        onClicked: {
-                            btn_status_mode.text = text
-                            status_view.statusMode = FluStatusView.Empty
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Error"
-                        onClicked: {
-                            btn_status_mode.text = text
-                            status_view.statusMode = FluStatusView.Error
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Success"
-                        onClicked: {
-                            btn_status_mode.text = text
-                            status_view.statusMode = FluStatusView.Success
-                        }
                     }
-                ]
+                }
+                FluMenuItem{
+                    text:"Empty"
+                    onClicked: {
+                        btn_status_mode.text = text
+                        status_view.statusMode = FluStatusView.Empty
+                    }
+                }
+                FluMenuItem{
+                    text:"Error"
+                    onClicked: {
+                        btn_status_mode.text = text
+                        status_view.statusMode = FluStatusView.Error
+                    }
+                }
+                FluMenuItem{
+                    text:"Success"
+                    onClicked: {
+                        btn_status_mode.text = text
+                        status_view.statusMode = FluStatusView.Success
+                    }
+                }
             }
         }
     }

example/qml/page/T_TabView.qml

@@ -40,57 +40,53 @@ FluScrollablePage{
                 id:btn_tab_width_behavior
                 Layout.preferredWidth: 140
                 text:"Equal"
-                items:[
+                FluMenuItem{
-                    FluMenuItem{
+                    text:"Equal"
-                        text:"Equal"
+                    onClicked: {
-                        onClicked: {
+                        btn_tab_width_behavior.text = text
-                            btn_tab_width_behavior.text = text
+                        tab_view.tabWidthBehavior = FluTabView.Equal
-                            tab_view.tabWidthBehavior = FluTabView.Equal
-                        }
-                    },
-                    FluMenuItem{
-                        text:"SizeToContent"
-                        onClicked: {
-                            btn_tab_width_behavior.text = text
-                            tab_view.tabWidthBehavior = FluTabView.SizeToContent
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Compact"
-                        onClicked: {
-                            btn_tab_width_behavior.text = text
-                            tab_view.tabWidthBehavior = FluTabView.Compact
-                        }
                     }
-                ]
+                }
+                FluMenuItem{
+                    text:"SizeToContent"
+                    onClicked: {
+                        btn_tab_width_behavior.text = text
+                        tab_view.tabWidthBehavior = FluTabView.SizeToContent
+                    }
+                }
+                FluMenuItem{
+                    text:"Compact"
+                    onClicked: {
+                        btn_tab_width_behavior.text = text
+                        tab_view.tabWidthBehavior = FluTabView.Compact
+                    }
+                }
             }
             FluDropDownButton{
                 id:btn_close_button_visibility
                 text:"Always"
                 Layout.preferredWidth: 120
-                items:[
+                FluMenuItem{
-                    FluMenuItem{
+                    text:"Nerver"
-                        text:"Nerver"
+                    onClicked: {
-                        onClicked: {
+                        btn_close_button_visibility.text = text
-                            btn_close_button_visibility.text = text
+                        tab_view.closeButtonVisibility = FluTabView.Nerver
-                            tab_view.closeButtonVisibility = FluTabView.Nerver
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Always"
-                        onClicked: {
-                            btn_close_button_visibility.text = text
-                            tab_view.closeButtonVisibility = FluTabView.Always
-                        }
-                    },
-                    FluMenuItem{
-                        text:"OnHover"
-                        onClicked: {
-                            btn_close_button_visibility.text = text
-                            tab_view.closeButtonVisibility = FluTabView.OnHover
-                        }
                     }
-                ]
+                }
+                FluMenuItem{
+                    text:"Always"
+                    onClicked: {
+                        btn_close_button_visibility.text = text
+                        tab_view.closeButtonVisibility = FluTabView.Always
+                    }
+                }
+                FluMenuItem{
+                    text:"OnHover"
+                    onClicked: {
+                        btn_close_button_visibility.text = text
+                        tab_view.closeButtonVisibility = FluTabView.OnHover
+                    }
+                }
             }
         }
     }

example/qml/page/T_TableView.qml

@@ -5,141 +5,135 @@ import QtQuick.Window
 import FluentUI
 import "qrc:///example/qml/component"
 
-FluScrollablePage{
+FluContentPage{
 
     title:"TableView"
 
     Component.onCompleted: {
-        const columns = [
+        loadData(1,1000)
-                          {
-                              title: '姓名',
-                              dataIndex: 'name',
-                              width:100
-                          },
-                          {
-                              title: '年龄',
-                              dataIndex: 'age',
-                              width:100
-                          },
-                          {
-                              title: '住址',
-                              dataIndex: 'address',
-                              width:200
-                          },
-                          {
-                              title: '别名',
-                              dataIndex: 'nickname',
-                              width:100
-                          },
-                          {
-                              title: '操作',
-                              dataIndex: 'action',
-                              width:120
-                          },
-                      ];
-        table_view.columns = columns
-        loadData(1,10)
-    }
-
-    FluTableView{
-        id:table_view
-        Layout.fillWidth: true
-        Layout.topMargin: 20
-        pageCurrent:1
-        pageCount:10
-        itemCount: 1000
-        onRequestPage:
-            (page,count)=> {
-                loadData(page,count)
-            }
-    }
-
-    Component{
-        id:com_action
-        Item{
-            Row{
-                anchors.centerIn: parent
-                spacing: 10
-                FluFilledButton{
-                    text:"编辑"
-                    horizontalPadding: 6
-                    onClicked:{
-                        showSuccess(JSON.stringify(dataObject))
-                    }
-                }
-                FluFilledButton{
-                    text:"删除"
-                    horizontalPadding: 6
-                    onClicked:{
-                        showError(JSON.stringify(dataObject))
-                    }
-                }
-            }
-        }
-    }
-
-    CodeExpander{
-        Layout.fillWidth: true
-        Layout.topMargin: 10
-        code:'FluTableView{
-    id:table_view
-    Layout.fillWidth: true
-    Layout.topMargin: 20
-    pageCurrent:1
-    pageCount:10
-    itemCount: 1000
-    onRequestPage:
-            (page,count)=> {
-                loadData(page,count)
-            }
-    Component.onCompleted: {
-        const columns = [
-                          {
-                              title: "姓名",
-                              dataIndex: "name",
-                              width:100
-                          },
-                          {
-                              title: "年龄",
-                              dataIndex: "age",
-                              width:100
-                          },
-                          {
-                              title: "住址",
-                              dataIndex: "address",
-                              width:200
-                          },
-                          {
-                              title: "别名",
-                              dataIndex: "nickname",
-                              width:100
-                          }
-                      ];
-        table_view.columns = columns
-        const dataSource = [
-                {
-                    name: "孙悟空”,
-                    age: 500,
-                    address:"钟灵毓秀的花果山,如神仙仙境的水帘洞",
-                    nickname:"齐天大圣"
-                }
-        ];
-        table_view.dataSource = columns
-    }
-}'
     }
 
     function loadData(page,count){
+        var numbers = [100, 300, 500, 1000];
+        function getRandomAge() {
+            var randomIndex = Math.floor(Math.random() * numbers.length);
+            return numbers[randomIndex];
+        }
+        var names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"];
+        function getRandomName(){
+            var randomIndex = Math.floor(Math.random() * names.length);
+            return names[randomIndex];
+        }
+        var nicknames = ["复海大圣","混天大圣","移山大圣","通风大圣","驱神大圣","齐天大圣","平天大圣"]
+        function getRandomNickname(){
+            var randomIndex = Math.floor(Math.random() * nicknames.length);
+            return nicknames[randomIndex];
+        }
+        var addresses = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
+        function getRandomAddresses(){
+            var randomIndex = Math.floor(Math.random() * addresses.length);
+            return addresses[randomIndex];
+        }
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push({
-                                name: "孙悟空%1".arg(((page-1)*count+i)),
+                                name: getRandomName(),
-                                age: 500,
+                                age:getRandomAge(),
-                                address: "钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                                address: getRandomAddresses(),
-                                nickname: "齐天大圣",
+                                nickname: getRandomNickname(),
-                                action:com_action
+                                height:40,
+                                minimumHeight:40,
+                                maximumHeight:200
                             })
         }
         table_view.dataSource = dataSource
     }
+
+    Component{
+        id:com_combobox
+        FluComboBox {
+            anchors.fill: parent
+            focus: true
+            currentIndex: display
+            editable: true
+            model: ListModel {
+                ListElement { text: 100 }
+                ListElement { text: 300 }
+                ListElement { text: 500 }
+                ListElement { text: 1000 }
+            }
+            Component.onCompleted: {
+                currentIndex=[100,300,500,1000].findIndex((element) => element === Number(display))
+                selectAll()
+            }
+            onCommit: {
+                display = editText
+                tableView.closeEditor()
+            }
+        }
+    }
+
+    FluTableView{
+        id:table_view
+        anchors{
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: gagination.top
+        }
+        anchors.topMargin: 20
+        columnSource:[
+            {
+                title: '姓名',
+                dataIndex: 'name',
+                width:100,
+                minimumWidth:80,
+                maximumWidth:200,
+                readOnly:true
+            },
+            {
+                title: '年龄',
+                dataIndex: 'age',
+                editDelegate:com_combobox,
+                width:100,
+                minimumWidth:100,
+                maximumWidth:100
+            },
+            {
+                title: '住址',
+                dataIndex: 'address',
+                width:200,
+                minimumWidth:100,
+                maximumWidth:250
+            },
+            {
+                title: '别名',
+                dataIndex: 'nickname',
+                width:100,
+                minimumWidth:80,
+                maximumWidth:200
+            }
+        ]
+    }
+
+    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,8 +7,9 @@ import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
-    title:"TextBox"
+    pageMode: FluNavigationView.SingleInstance
 
+    title:"TextBox"
     FluArea{
         Layout.fillWidth: true
         height: 68

example/qml/page/T_TimePicker.qml

@@ -27,6 +27,9 @@ FluScrollablePage{
             }
 
             FluTimePicker{
+                onCurrentChanged: {
+                    showSuccess(current.toLocaleTimeString(Qt.locale("de_DE")))
+                }
             }
 
         }
@@ -53,11 +56,14 @@ FluScrollablePage{
             }
 
             FluText{
-                text:"hourFormat=FluTimePicker.H"
+                text:"hourFormat=FluTimePicker.HH"
             }
 
             FluTimePicker{
                  hourFormat:FluTimePicker.HH
+                 onCurrentChanged: {
+                     showSuccess(current.toLocaleTimeString(Qt.locale("de_DE")))
+                 }
             }
 
         }

example/qml/page/T_ToggleSwitch.qml

@@ -22,6 +22,12 @@ FluScrollablePage{
             }
             FluToggleSwitch{
                 disabled: toggle_switch.checked
+                text:"Right"
+            }
+            FluToggleSwitch{
+                disabled: toggle_switch.checked
+                text:"Left"
+                textRight: false
             }
         }
         FluToggleSwitch{

example/qml/page/T_TreeView.qml

@@ -60,29 +60,27 @@ FluScrollablePage {
                 id:btn_selection_model
                 Layout.preferredWidth: 140
                 text:"None"
-                items:[
+                FluMenuItem{
-                    FluMenuItem{
+                    text:"None"
-                        text:"None"
+                    onClicked: {
-                        onClicked: {
+                        btn_selection_model.text = text
-                            btn_selection_model.text = text
+                        tree_view.selectionMode = FluTabView.Equal
-                            tree_view.selectionMode = FluTabView.Equal
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Single"
-                        onClicked: {
-                            btn_selection_model.text = text
-                            tree_view.selectionMode = FluTabView.SizeToContent
-                        }
-                    },
-                    FluMenuItem{
-                        text:"Muiltple"
-                        onClicked: {
-                            btn_selection_model.text = text
-                            tree_view.selectionMode = FluTabView.Compact
-                        }
                     }
-                ]
+                }
+                FluMenuItem{
+                    text:"Single"
+                    onClicked: {
+                        btn_selection_model.text = text
+                        tree_view.selectionMode = FluTabView.SizeToContent
+                    }
+                }
+                FluMenuItem{
+                    text:"Muiltple"
+                    onClicked: {
+                        btn_selection_model.text = text
+                        tree_view.selectionMode = FluTabView.Compact
+                    }
+                }
             }
             FluFilledButton{
                 text:"获取选中的数据"

example/qml/page/T_Typography.qml

@@ -10,10 +10,6 @@ FluContentPage {
     title: "Typography"
     rightPadding: 10
 
-    Component.onCompleted: {
-        slider.seek(0)
-    }
-
     FluArea{
         anchors{
             top:parent.top
@@ -73,7 +69,7 @@ FluContentPage {
 
         FluSlider{
             id:slider
-            vertical:true
+            orientation: Qt.Vertical
             anchors{
                 right: parent.right
                 rightMargin: 45

example/qml/window/MainWindow.qml

@@ -134,8 +134,9 @@ CustomWindow {
 
             FluRemoteLoader{
                 id:loader
+                lazy: true
                 anchors.fill: parent
-//                source: "http://localhost:9000/RemoteComponent.qml"
+                //                source: "http://localhost:9000/RemoteComponent.qml"
                 source: "https://zhu-zichu.gitee.io/RemoteComponent.qml"
             }
         }
@@ -219,7 +220,7 @@ CustomWindow {
             NumberAnimation {
                 target: canvas
                 property: "radius"
-                duration: 666
+                duration: 333
                 easing.type: Easing.OutCubic
             }
         }

example/qml/window/MediaWindow.qml

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

example/qml/window/StandardWindow.qml

@@ -13,6 +13,28 @@ CustomWindow {
     fixSize: true
     launchMode: FluWindow.Standard
 
+    FluMenuBar {
+        FluMenu {
+            title: qsTr("File")
+            Action { text: qsTr("New...") }
+            Action { text: qsTr("Open...") }
+            Action { text: qsTr("Save") }
+            Action { text: qsTr("Save As...") }
+            FluMenuSeparator { }
+            Action { text: qsTr("Quit") }
+        }
+        FluMenu {
+            title: qsTr("Edit")
+            Action { text: qsTr("Cut") }
+            Action { text: qsTr("Copy") }
+            Action { text: qsTr("Paste") }
+        }
+        FluMenu {
+            title: qsTr("Help")
+            Action { text: qsTr("About") }
+        }
+    }
+
     FluText{
         anchors.centerIn: parent
         text:"我是一个Standard模式的窗口，每次我都会创建一个新的窗口"

src/CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.20)
 project(fluentuiplugin LANGUAGES CXX)
 
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
@@ -13,9 +12,17 @@ endif()
 set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,3,0)
+add_definitions(-DVERSION=1,3,6,2)
 
-find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml ShaderTools)
+find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
+
+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)
@@ -32,7 +39,7 @@ foreach(filepath ${QML_PATHS})
 endforeach(filepath)
 
 #遍历所有资源文件
-file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp *.qsb *.metainfo)
+file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp)
 foreach(filepath ${RES_PATHS})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
     list(APPEND resource_files ${filename})
@@ -57,8 +64,6 @@ qt_add_qml_module(fluentuiplugin
     SOURCES ${sources_files} fluentui.rc
     QML_FILES ${qml_files}
     RESOURCES ${resource_files}
-    #支持designer
-    DESIGNER_SUPPORTED
 )
 
 #链接库
@@ -68,15 +73,5 @@ target_link_libraries(fluentuiplugin PUBLIC
     Qt::QmlPrivate
 )
 
-#链接库 win32库 不然mingw会编译错误
+#安装
-if(WIN32)
+install(DIRECTORY ${QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports)
-    target_link_libraries(fluentuiplugin PRIVATE dwmapi user32)
-endif()
-
-#如果是debug，则生成的库文件名后面拼接d
-# 在MinGW和GCC/Clang中, 默认不会链接带`d`后缀的动态库
-if(MSVC)
-    set_target_properties(fluentuiplugin PROPERTIES DEBUG_POSTFIX "d")  
-endif(MSVC)
-
-

src/FluApp.cpp

@@ -38,11 +38,15 @@ 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()) {
+        qCritical() << component.errors();
+        return;
+    }
     QVariantMap properties;
     properties.insert("route",route);
     if(fluRegister){

src/FluTextStyle.cpp

@@ -8,7 +8,7 @@ FluTextStyle::FluTextStyle(QObject *parent)
     Caption(caption);
 
     QFont body;
-    body.setPixelSize(14);
+    body.setPixelSize(13);
     Body(body);
 
     QFont bodyStrong;

src/FluTools.cpp

@@ -2,6 +2,7 @@
 #include <QGuiApplication>
 #include <QClipboard>
 #include <QUuid>
+#include <QCursor>
 
 FluTools* FluTools::m_instance = nullptr;
 
@@ -63,6 +64,26 @@ 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();
+}

src/FluTools.h

@@ -50,6 +50,14 @@ public:
 
     Q_INVOKABLE void setQuitOnLastWindowClosed(bool val);
 
+    Q_INVOKABLE int qtMajor();
+
+    Q_INVOKABLE int qtMinor();
+
+    Q_INVOKABLE void setOverrideCursor(Qt::CursorShape shape);
+
+    Q_INVOKABLE void restoreOverrideCursor();
+
 };
 
 #endif // FLUTOOLS_H

src/imports/FluentUI/Controls/FluAppBar.qml

@@ -76,20 +76,16 @@ Rectangle{
         anchors.right: parent.right
         height: root.height
         spacing: 0
-        RowLayout{
+        FluToggleSwitch{
+            id:btn_dark
             Layout.alignment: Qt.AlignVCenter
             Layout.rightMargin: 5
             visible: showDark
-            spacing: 5
+            text:darkText
-            FluText{
+            textColor:root.textColor
-                text:darkText
+            checked: FluTheme.dark
-                color:root.textColor
+            textRight: false
-            }
+            clickListener:()=> darkClickListener(btn_dark)
-            FluToggleSwitch{
-                id:btn_dark
-                checked: FluTheme.dark
-                clickListener:()=> darkClickListener(btn_dark)
-            }
         }
         FluIconButton{
             id:btn_minimize
@@ -147,4 +143,8 @@ Rectangle{
         return btn_close
     }
 
+    function darkButton(){
+        return btn_dark
+    }
+
 }

src/imports/FluentUI/Controls/FluBadge.qml

@@ -4,8 +4,9 @@ import FluentUI
 
 Rectangle{
     property bool isDot: false
-    property bool showZero: true
+    property bool showZero: false
     property int count: 0
+    property bool topRight: false
     id:control
     color:Qt.rgba(255/255,77/255,79/255,1)
     width: {
@@ -14,7 +15,7 @@ Rectangle{
         if(count<10){
             return 20
         }else if(count<100){
-           return 30
+            return 30
         }
         return 40
     }
@@ -30,35 +31,41 @@ Rectangle{
     }
     border.width: 1
     border.color: Qt.rgba(1,1,1,1)
-    visible: {
-        if(showZero)
-            return true
-        return count!==0
-    }
     anchors{
         right: {
-            if(parent)
+            if(parent && topRight)
                 return parent.right
             return undefined
         }
         top: {
-            if(parent)
+            if(parent && topRight)
                 return parent.top
             return undefined
         }
         rightMargin: {
-            if(isDot){
+            if(parent && topRight){
-                return -2.5
+                if(isDot){
+                    return -2.5
+                }
+                return -(control.width/2)
             }
-            return -(control.width/2)
+            return 0
         }
         topMargin: {
-            if(isDot){
+            if(parent && topRight){
-                return -2.5
+                if(isDot){
+                    return -2.5
+                }
+                return  -10
             }
-            return  -10
+            return 0
         }
     }
+    visible: {
+        if(showZero)
+            return true
+        return count!==0
+    }
     Text{
         anchors.centerIn: parent
         color: Qt.rgba(1,1,1,1)

src/imports/FluentUI/Controls/FluButton.qml

@@ -11,7 +11,7 @@ Button {
     property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1)
     property color textColor: {
         if(FluTheme.dark){
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(131/255,131/255,131/255,1)
             }
             if(pressed){
@@ -19,7 +19,7 @@ Button {
             }
             return Qt.rgba(1,1,1,1)
         }else{
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(160/255,160/255,160/255,1)
             }
             if(pressed){
@@ -44,7 +44,7 @@ Button {
         border.width: 1
         radius: 4
         color:{
-            if(disabled){
+            if(!enabled){
                 return disableColor
             }
             return hovered ? hoverColor :normalColor

src/imports/FluentUI/Controls/FluCalendarView.qml

@@ -243,8 +243,6 @@ Item {
             }
             FluTextButton{
                 id:title
-                leftPadding: 0
-                rightPadding: 0
                 anchors{
                     verticalCenter: parent.verticalCenter
                     left: parent.left

src/imports/FluentUI/Controls/FluCheckBox.qml

@@ -19,6 +19,10 @@ Button {
     property color checkedPreesedColor: FluTheme.dark ? Qt.darker(checkedColor,1.3) : Qt.lighter(checkedColor,1.3)
     property color checkedDisableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
     property color disableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)
+    property real size: 18
+    property alias textColor: btn_text.textColor
+    property bool textRight: true
+    property real textSpacing: 6
     property var clickListener : function(){
         checked = !checked
     }
@@ -39,13 +43,14 @@ Button {
     Accessible.onPressAction: control.clicked()
     focusPolicy:Qt.TabFocus
     contentItem: RowLayout{
-        spacing: 4
+        spacing: control.textSpacing
+        layoutDirection:control.textRight ? Qt.LeftToRight : Qt.RightToLeft
         Rectangle{
-            width: 20
+            width: control.size
-            height: 20
+            height: control.size
             radius: 4
             border.color: {
-                if(disabled){
+                if(!enabled){
                     return borderDisableColor
                 }
                 if(checked){
@@ -62,7 +67,7 @@ Button {
             border.width: 1
             color: {
                 if(checked){
-                    if(disabled){
+                    if(!enabled){
                         return checkedDisableColor
                     }
                     if(pressed){
@@ -73,7 +78,7 @@ Button {
                     }
                     return checkedColor
                 }
-                if(disabled){
+                if(!enabled){
                     return disableColor
                 }
                 if(hovered){
@@ -100,8 +105,9 @@ Button {
             }
         }
         FluText{
+            id:btn_text
             text: control.text
-            Layout.leftMargin: 5
+            Layout.alignment: Qt.AlignVCenter
             visible: text !== ""
         }
     }

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)
@@ -24,7 +25,6 @@ ComboBox {
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
         palette.text: control.palette.text
         palette.highlightedText: control.palette.highlightedText
-        font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
         highlighted: control.highlightedIndex === index
         hoverEnabled: control.hoverEnabled
     }
@@ -37,7 +37,6 @@ ComboBox {
         iconSize: 15
         opacity: enabled ? 1 : 0.3
     }
-
     contentItem: T.TextField {
         property bool disabled: !control.editable
         leftPadding: !control.mirrored ? 12 : control.editable && activeFocus ? 3 : 1
@@ -46,6 +45,7 @@ ComboBox {
         bottomPadding: 6 - control.padding
         renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
         selectionColor: FluTheme.primaryColor.lightest
+        selectedTextColor: control.palette.highlightedText
         text: control.editable ? control.editText : control.displayText
         enabled: control.editable
         autoScroll: control.editable
@@ -64,6 +64,15 @@ ComboBox {
             border.width: 0
             inputItem: contentItem
         }
+        Component.onCompleted: {
+            forceActiveFocus()
+        }
+        Keys.onEnterPressed: {
+            control.commit()
+        }
+        Keys.onReturnPressed: {
+            control.commit()
+        }
     }
 
     background: Rectangle {
@@ -74,7 +83,7 @@ ComboBox {
         visible: !control.flat || control.down
         radius: 4
         FluFocusRectangle{
-            visible: control.activeFocus
+            visible: control.visualFocus
             radius:4
             anchors.margins: -2
         }

src/imports/FluentUI/Controls/FluContentPage.qml

@@ -4,20 +4,18 @@ import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
 
-Item {
+FluPage {
     property alias title: text_title.text
     default property alias content: container.data
     property int leftPadding: 10
     property int topPadding: 0
     property int rightPadding: 10
     property int bottomPadding: 10
-    property int pageMode: FluNavigationView.Standard
-    property string url: ''
     id:control
     FluText{
         id:text_title
         visible: text !== ""
-        height: visible ? implicitHeight : 0
+        height: visible ? contentHeight : 0
         font: FluTextStyle.Title
         anchors{
             top: parent.top

src/imports/FluentUI/Controls/FluCopyableText.qml

@@ -14,9 +14,13 @@ TextEdit {
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
+    selectedTextColor: FluColors.Grey220
     bottomPadding: 0
     selectionColor: FluTheme.primaryColor.lightest
     font:FluTextStyle.Body
+    onSelectedTextChanged: {
+        control.forceActiveFocus()
+    }
     TapHandler {
         acceptedButtons: Qt.RightButton
         onTapped: control.echoMode !== TextInput.Password && menu.popup()

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
@@ -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 ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,230/255,234/255,1)
+   color: FluTheme.dark ? Qt.rgba(60/255,60/255,60/255,1) : Qt.rgba(210/255,210/255,210/255,1)
 }

src/imports/FluentUI/Controls/FluDropDownButton.qml

@@ -12,7 +12,7 @@ Button {
     property color disableColor: FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1)
     property color textColor: {
         if(FluTheme.dark){
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(131/255,131/255,131/255,1)
             }
             if(pressed){
@@ -20,7 +20,7 @@ Button {
             }
             return Qt.rgba(1,1,1,1)
         }else{
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(160/255,160/255,160/255,1)
             }
             if(pressed){
@@ -30,7 +30,7 @@ Button {
         }
     }
     property var window : Window.window
-    property alias items: menu.content
+    default property alias contentData: menu.contentData
     Accessible.role: Accessible.Button
     Accessible.name: control.text
     Accessible.description: contentDescription
@@ -51,7 +51,7 @@ Button {
             radius:8
         }
         color:{
-            if(disabled){
+            if(!enabled){
                 return disableColor
             }
             return hovered ? hoverColor :normalColor
@@ -75,9 +75,9 @@ Button {
         color: control.textColor
     }
     onClicked: {
-        if(items && menu.getContainerCount()!==0){
+        if(items && menu.count !==0){
             var pos = control.mapToItem(null, 0, 0)
-            var containerHeight = menu.getContainerHeight()
+            var containerHeight = menu.count*36
             if(window.height>pos.y+control.height+containerHeight){
                 menu.y = control.height
             }else if(pos.y>containerHeight){
@@ -90,6 +90,7 @@ Button {
     }
     FluMenu{
         id:menu
+        modal:true
         width: control.width
     }
 }

src/imports/FluentUI/Controls/FluExpander.qml

@@ -57,7 +57,7 @@ Item {
                 iconSize: 15
                 Behavior on rotation {
                     NumberAnimation{
-                        duration: 150
+                        duration: 167
                     }
                 }
             }
@@ -79,8 +79,7 @@ Item {
         Behavior on height {
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.BezierSpline
+                easing.type: Easing.InCubic
-                easing.bezierCurve: expand ? [ 0, 0, 0, 1 ] : [ 1, 0, 0, 0 ]
             }
         }
     }

src/imports/FluentUI/Controls/FluFilledButton.qml

@@ -12,7 +12,7 @@ Button {
     property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2)
     property color textColor: {
         if(FluTheme.dark){
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(173/255,173/255,173/255,1)
             }
             return Qt.rgba(0,0,0,1)
@@ -38,7 +38,7 @@ Button {
             radius:4
         }
         color:{
-            if(disabled){
+            if(!enabled){
                 return disableColor
             }
             if(pressed){

src/imports/FluentUI/Controls/FluHorizontalHeaderView.qml

@@ -0,0 +1,27 @@
+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/FluIconButton.qml

@@ -9,12 +9,12 @@ Button {
     property bool disabled: false
     property int radius:4
     property string contentDescription: ""
-    property color hoverColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(0,0,0,0.03)
+    property color hoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
-    property color pressedColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(0,0,0,0.06)
+    property color pressedColor: FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
     property color normalColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
     property color disableColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
     property color color: {
-        if(disabled){
+        if(!enabled){
             return disableColor
         }
         if(pressed){
@@ -24,12 +24,12 @@ Button {
     }
     property color iconColor: {
         if(FluTheme.dark){
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(130/255,130/255,130/255,1)
             }
             return Qt.rgba(1,1,1,1)
         }else{
-            if(disabled){
+            if(!enabled){
                 return Qt.rgba(161/255,161/255,161/255,1)
             }
             return Qt.rgba(0,0,0,1)

src/imports/FluentUI/Controls/FluMediaPlayer.qml

@@ -1,202 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtMultimedia
-import FluentUI
-
-Rectangle {
-    property url source
-    property bool showControl: false
-    property real volume: 30
-    id:control
-    width: 480
-    height: 270
-    color: FluColors.Black
-    clip: true
-    MouseArea{
-        anchors.fill: parent
-        preventStealing: true
-        onClicked: {
-            showControl = !showControl
-        }
-    }
-    MediaPlayer {
-        id: mediaplayer
-        property bool autoSeek:true
-        source: control.source
-        videoOutput: video_output
-        audioOutput: AudioOutput{
-            id:audio_output
-        }
-        onErrorStringChanged:
-            (error)=> {
-                console.debug(errorString)
-            }
-        onPositionChanged: {
-            if(autoSeek){
-                slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration)
-            }
-        }
-        onMediaStatusChanged:
-            (status)=> {
-                if(status===2){
-                    slider.maxValue = mediaplayer.duration
-                    showControl = true
-                    mediaplayer.play()
-                }
-            }
-    }
-    onSourceChanged: {
-        slider.seek(0)
-    }
-    VideoOutput {
-        id:video_output
-        anchors.fill: parent
-    }
-    Item{
-        height: 100
-        y:showControl ? control.height - 110 : control.height
-        anchors{
-            horizontalCenter: parent.horizontalCenter
-        }
-        width: 460
-        opacity: showControl
-        MouseArea{
-            anchors.fill: parent
-        }
-        Behavior on opacity{
-            NumberAnimation{
-                duration: 150
-            }
-        }
-        Behavior on y{
-            NumberAnimation{
-                duration: 150
-            }
-        }
-        Rectangle{
-            anchors.fill: parent
-            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
-            radius: 5
-        }
-
-        FluSlider{
-            id:slider
-            size:parent.width-20
-            y:20
-            anchors.horizontalCenter: parent.horizontalCenter
-            tipEnabled:false
-            onPressed: {
-                mediaplayer.autoSeek = false
-                mediaplayer.pause()
-            }
-            value:mediaplayer.position
-            onReleased: {
-                mediaplayer.autoSeek = true
-                mediaplayer.play()
-            }
-            onValueChanged: {
-                if(mediaplayer.autoSeek == false){
-                    mediaplayer.position = value*mediaplayer.duration/slider.maxValue
-                }
-            }
-            onLineClickFunc:function(val){
-                mediaplayer.position = val*mediaplayer.duration/slider.maxValue
-            }
-        }
-        FluText{
-            id:start_time
-            anchors{
-                top: slider.bottom
-                topMargin: 10
-                left: slider.left
-            }
-            text: formatDuration(slider.value*mediaplayer.duration/slider.maxValue)
-        }
-        FluText{
-            id:end_time
-            anchors{
-                top: slider.bottom
-                right: slider.right
-                topMargin: 10
-            }
-            text: formatDuration(mediaplayer.duration)
-        }
-        Row{
-            spacing: 10
-            anchors{
-                horizontalCenter: parent.horizontalCenter
-                bottom: parent.bottom
-                bottomMargin: 10
-            }
-            FluIconButton{
-                iconSize: 17
-                iconSource:  FluentIcons.SkipBack10
-                onClicked: {
-                    mediaplayer.position = Math.max(mediaplayer.position-10*1000,0)
-                }
-            }
-            FluIconButton{
-                iconSize: 15
-                iconSource: mediaplayer.playbackState === MediaPlayer.PlayingState ?   FluentIcons.Pause  : FluentIcons.Play
-                onClicked: {
-                    if(mediaplayer.playbackState === MediaPlayer.PlayingState){
-                        mediaplayer.pause()
-                    }else{
-                        mediaplayer.play()
-                    }
-                }
-            }
-            FluIconButton{
-                iconSize: 17
-                iconSource:  FluentIcons.SkipForward30
-                onClicked: {
-                    mediaplayer.position = Math.min(mediaplayer.position+30*1000,mediaplayer.duration)
-                }
-            }
-        }
-        FluIconButton{
-            id:btn_volume
-            iconSize: 17
-            iconSource:  audio_output.muted ? FluentIcons.Mute  :  FluentIcons.Volume
-            anchors{
-                left: parent.left
-                leftMargin: 5
-                bottom: parent.bottom
-                bottomMargin: 10
-            }
-            onClicked: {
-                audio_output.muted = !audio_output.muted
-            }
-        }
-        FluSlider{
-            id:slider_volume
-            size: 80
-            dotSize: 20
-            value:30
-            anchors{
-                left:btn_volume.right
-                verticalCenter: btn_volume.verticalCenter
-                leftMargin: 10
-            }
-            onValueChanged:{
-                audio_output.volume = value/100
-            }
-        }
-    }
-    function formatDuration(duration) {
-        const seconds = Math.floor(duration / 1000);
-        const hours = Math.floor(seconds / 3600);
-        const minutes = Math.floor((seconds % 3600) / 60);
-        const remainingSeconds = seconds % 60;
-        return `${pad(hours)}:${pad(minutes)}:${pad(remainingSeconds)}`;
-    }
-    function pad(value) {
-        return value.toString().padStart(2, '0');
-    }
-    function pause(){
-        mediaplayer.pause()
-    }
-    function play(){
-        mediaplayer.play()
-    }
-}

src/imports/FluentUI/Controls/FluMenu.qml

@@ -1,23 +1,26 @@
 import QtQuick
-import QtQuick.Layouts
 import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
 import FluentUI
 
-Menu {
+T.Menu {
-    default property alias content: container.data
+    property bool animEnabled: true
-    property bool enableAnimation: true
+    id: control
-    id: popup
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-    width: 140
+                            contentWidth + leftPadding + rightPadding)
-    height: container.height
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-    modal:true
+                             contentHeight + topPadding + bottomPadding)
-    dim:false
+    margins: 0
+    overlap: 1
+    spacing: 0
+    delegate: FluMenuItem { }
     enter: Transition {
-        reversible: true
         NumberAnimation {
             property: "opacity"
             from:0
             to:1
-            duration: enableAnimation ? 83 : 0
+            duration: animEnabled ? 83 : 0
         }
     }
     exit:Transition {
@@ -25,38 +28,32 @@ Menu {
             property: "opacity"
             from:1
             to:0
-            duration: enableAnimation ? 83 : 0
+            duration: animEnabled ? 83 : 0
         }
     }
-    background:Item{
+    contentItem: ListView {
-        FluShadow{
+        implicitHeight: contentHeight
-            radius: 5
+        model: control.contentModel
-        }
+        interactive: Window.window
-    }
+                     ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height
-    contentItem: Item {
+                     : false
         clip: true
-        Rectangle{
+        currentIndex: control.currentIndex
-            anchors.fill: parent
+        ScrollIndicator.vertical: ScrollIndicator {}
-            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1)
-            border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
-            border.width: 1
-            radius: 5
-        }
-        Column{
-            id:container
-            spacing: 5
-            topPadding: 5
-            bottomPadding: 5
-            width: popup.width
-            function closePopup(){
-                popup.close()
-            }
-        }
     }
-    function getContainerHeight(){
+    background: Rectangle {
-        return container.height
+        implicitWidth: 150
+        implicitHeight: 36
+        color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(240/255,240/255,240/255,1)
+        border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+        border.width: 1
+        radius: 5
+        FluShadow{}
     }
-    function getContainerCount(){
+    T.Overlay.modal: Rectangle {
-        return container.children.length
+        color: Color.transparent(control.palette.shadow, 0.5)
+    }
+    T.Overlay.modeless: Rectangle {
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }

src/imports/FluentUI/Controls/FluMenuBar.qml

@@ -0,0 +1,21 @@
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls.impl
+
+T.MenuBar {
+    id: control
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            contentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             contentHeight + topPadding + bottomPadding)
+    delegate: FluMenuBarItem { }
+    contentItem: Row {
+        spacing: control.spacing
+        Repeater {
+            model: control.contentModel
+        }
+    }
+    background: Item {
+        implicitHeight: 30
+    }
+}

src/imports/FluentUI/Controls/FluMenuBarItem.qml

@@ -0,0 +1,70 @@
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.Controls.impl
+import FluentUI
+
+T.MenuBarItem {
+    property bool disabled: false
+    property color textColor: {
+        if(FluTheme.dark){
+            if(disabled){
+                return Qt.rgba(131/255,131/255,131/255,1)
+            }
+            if(pressed){
+                return Qt.rgba(162/255,162/255,162/255,1)
+            }
+            return Qt.rgba(1,1,1,1)
+        }else{
+            if(disabled){
+                return Qt.rgba(160/255,160/255,160/255,1)
+            }
+            if(pressed){
+                return Qt.rgba(96/255,96/255,96/255,1)
+            }
+            return Qt.rgba(0,0,0,1)
+        }
+    }
+    id: control
+    enabled: !disabled
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding,
+                             implicitIndicatorHeight + topPadding + bottomPadding)
+    spacing: 6
+    padding: 6
+    leftPadding: 12
+    rightPadding: 16
+    icon.width: 24
+    icon.height: 24
+    icon.color: control.palette.buttonText
+    contentItem: FluText {
+        verticalAlignment: Text.AlignVCenter
+        text: control.text
+        color:control.textColor
+    }
+    background: Rectangle {
+        implicitWidth: 30
+        implicitHeight: 30
+        radius: 3
+        color: {
+            if(FluTheme.dark){
+                if(control.highlighted){
+                    return Qt.rgba(1,1,1,0.06)
+                }
+                if(control.hovered){
+                    return Qt.rgba(1,1,1,0.03)
+                }
+                return Qt.rgba(0,0,0,0)
+            }else{
+                if(control.highlighted){
+                    return Qt.rgba(0,0,0,0.06)
+                }
+                if(control.hovered){
+                    return Qt.rgba(0,0,0,0.03)
+                }
+                return Qt.rgba(0,0,0,0)
+            }
+        }
+    }
+}

src/imports/FluentUI/Controls/FluMenuItem.qml

@@ -1,52 +1,86 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
 import FluentUI
 
-Item {
+T.MenuItem {
-    property string text: "MenuItem"
+    property color textColor: {
-    property var onClickFunc
+        if(FluTheme.dark){
-    signal clicked
+            if(!enabled){
-    id:control
+                return Qt.rgba(131/255,131/255,131/255,1)
-    width: {
-        if(control.parent){
-            return control.parent.width
-        }
-        return 140
-    }
-    height: 32
-    Rectangle{
-        anchors.centerIn: parent
-        width: control.width-40
-        height: 32
-        radius: 4
-        color:{
-            if(FluTheme.dark){
-                if(mouse_area.containsMouse){
-                    return Qt.rgba(1,1,1,0.05)
-                }
-                return Qt.rgba(0,0,0,0)
-            }else{
-                if(mouse_area.containsMouse){
-                    return Qt.rgba(0,0,0,0.05)
-                }
-                return Qt.rgba(0,0,0,0)
             }
+            if(pressed){
+                return Qt.rgba(162/255,162/255,162/255,1)
+            }
+            return Qt.rgba(1,1,1,1)
+        }else{
+            if(!enabled){
+                return Qt.rgba(160/255,160/255,160/255,1)
+            }
+            if(pressed){
+                return Qt.rgba(96/255,96/255,96/255,1)
+            }
+            return Qt.rgba(0,0,0,1)
         }
-        FluText{
+    }
-            text: control.text
+    id: control
-            anchors.centerIn: parent
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-        }
+                            implicitContentWidth + leftPadding + rightPadding)
-        MouseArea{
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-            id:mouse_area
+                             implicitContentHeight + topPadding + bottomPadding,
-            hoverEnabled: true
+                             implicitIndicatorHeight + topPadding + bottomPadding)
+    padding: 6
+    spacing: 6
+    icon.width: 24
+    icon.height: 24
+    icon.color: control.palette.windowText
+    height: visible ? implicitHeight : 0
+    contentItem: FluText {
+        readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0
+        readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0
+        leftPadding: (!control.mirrored ? indicatorPadding : arrowPadding)+5
+        rightPadding: (control.mirrored ? indicatorPadding : arrowPadding)+5
+        verticalAlignment: Text.AlignVCenter
+        text: control.text
+        color: control.textColor
+
+    }
+    indicator: FluIcon {
+        x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
+        y: control.topPadding + (control.availableHeight - height) / 2
+        visible: control.checked
+        iconSource: FluentIcons.CheckMark
+    }
+    arrow: FluIcon {
+        x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
+        y: control.topPadding + (control.availableHeight - height) / 2
+        visible: control.subMenu
+        iconSource: FluentIcons.ChevronRightMed
+    }
+    background: Item {
+        implicitWidth: 150
+        implicitHeight: 36
+        x: 1
+        y: 1
+        width: control.width - 2
+        height: control.height - 2
+        Rectangle{
             anchors.fill: parent
-            onClicked: {
+            anchors.margins: 3
-                if(control.onClickFunc){
+            radius: 4
-                    control.onClickFunc()
+            color:{
-                    return
+                if(FluTheme.dark){
+                    if(control.highlighted){
+                        return Qt.rgba(1,1,1,0.06)
+                    }
+                    return Qt.rgba(0,0,0,0)
+                }else{
+                    if(control.highlighted){
+                        return Qt.rgba(0,0,0,0.06)
+                    }
+                    return Qt.rgba(0,0,0,0)
                 }
-                control.parent.closePopup()
-                control.clicked()
             }
         }
     }

src/imports/FluentUI/Controls/FluMenuSeparator.qml

@@ -0,0 +1,19 @@
+import QtQuick
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import FluentUI
+
+T.MenuSeparator {
+    id: control
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+    padding: 0
+    verticalPadding: 0
+    contentItem: Rectangle {
+        implicitWidth: 188
+        implicitHeight: 1
+        color: FluTheme.dark ? Qt.rgba(60/255,60/255,60/255,1) : Qt.rgba(210/255,210/255,210/255,1)
+    }
+}

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)
@@ -14,7 +15,7 @@ TextArea{
     width: 300
     enabled: !disabled
     color: {
-        if(disabled){
+        if(!enabled){
             return disableColor
         }
         return normalColor
@@ -24,7 +25,7 @@ TextArea{
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
     selectionColor: FluTheme.primaryColor.lightest
     placeholderTextColor: {
-        if(disabled){
+        if(!enabled){
             return placeholderDisableColor
         }
         if(focus){
@@ -34,6 +35,12 @@ TextArea{
     }
     selectByMouse: true
     background: FluTextBoxBackground{ inputItem: control }
+    Keys.onEnterPressed: {
+        control.commit()
+    }
+    Keys.onBackPressed: {
+        control.commit()
+    }
     TapHandler {
         acceptedButtons: Qt.RightButton
         onTapped: control.echoMode !== TextInput.Password && menu.popup()

src/imports/FluentUI/Controls/FluNavigationView.qml

@@ -14,7 +14,9 @@ Item {
     }
     enum PageModeFlag{
         Standard = 0,
-        SingleTask = 1
+        SingleTask = 1,
+        SingleTop = 2,
+        SingleInstance = 3
     }
     property url logo
     property string title: ""
@@ -29,6 +31,7 @@ Item {
     id:control
     QtObject{
         id:d
+        property var pageMap: ({})
         property var stackItems: []
         property int displayMode: FluNavigationView.Open
         property bool enableNavigationPanel: false
@@ -118,9 +121,7 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
+                    duration: 83
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
         }
@@ -136,9 +137,7 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
+                    duration: 83
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
             width: layout_list.width
@@ -177,6 +176,33 @@ Item {
                     }
                     model.isExpand = !model.isExpand
                 }
+                Rectangle{
+                    color:Qt.rgba(255/255,77/255,79/255,1)
+                    width: 10
+                    height: 10
+                    radius: 5
+                    border.width: 1
+                    border.color: Qt.rgba(1,1,1,1)
+                    anchors{
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                        rightMargin: 3
+                        verticalCenterOffset: -8
+                    }
+                    visible: {
+                        if(!model.isExpand){
+
+                            for(var i=0;i<model.children.length;i++){
+                                var item = model.children[i]
+                                if(item.infoBadge && item.count !==0){
+                                    return true
+                                }
+                            }
+                        }
+                        return false
+                    }
+                }
+
                 Rectangle{
                     radius: 4
                     anchors.fill: parent
@@ -198,7 +224,9 @@ Item {
                             verticalCenter: parent.verticalCenter
                         }
                     }
+
                     FluIcon{
+                        id:item_icon_expand
                         rotation: model.isExpand?0:180
                         iconSource:FluentIcons.ChevronUp
                         iconSize: 15
@@ -278,9 +306,11 @@ Item {
                             }
                             return true
                         }
+                        elide: Text.ElideRight
                         anchors{
                             verticalCenter: parent.verticalCenter
                             left:item_icon.right
+                            right: item_icon_expand.left
                         }
                         color:{
                             if(item_control.pressed){
@@ -298,9 +328,7 @@ Item {
         Item{
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
+                    duration: 83
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: [ 0, 0, 0, 1 ]
                 }
             }
             clip: true
@@ -428,6 +456,7 @@ Item {
                             }
                             return true
                         }
+                        elide: Text.ElideRight
                         color:{
                             if(item_control.pressed){
                                 return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
@@ -437,6 +466,31 @@ Item {
                         anchors{
                             verticalCenter: parent.verticalCenter
                             left:item_icon.right
+                            right: item_dot_loader.left
+                        }
+                    }
+                    Loader{
+                        id:item_dot_loader
+                        property bool isDot: (item_dot_loader.item&&item_dot_loader.item.isDot)
+                        anchors{
+                            right: parent.right
+                            verticalCenter: parent.verticalCenter
+                            rightMargin: isDot ? 3 : 10
+                            verticalCenterOffset: isDot ? -8 : 0
+                        }
+                        sourceComponent: {
+                            if(model.infoBadge){
+                                return model.infoBadge
+                            }
+                            return undefined
+                        }
+                        Connections{
+                            target: d
+                            function onIsCompactAndNotPanelChanged(){
+                                if(item_dot_loader.item){
+                                    item_dot_loader.item.isDot = d.isCompactAndNotPanel
+                                }
+                            }
                         }
                     }
                 }
@@ -474,6 +528,20 @@ Item {
                         layout_footer.currentIndex = item.idx-(nav_list.count-layout_footer.count)
                     }
                     nav_list.currentIndex = item.idx
+                    if(nav_swipe.currentItem.pageMode === FluNavigationView.SingleInstance){
+                        var url = nav_swipe.currentItem.url
+                        var pageIndex = -1
+                        for(var i=0;i<nav_swipe2.children.length;i++){
+                            var obj =  nav_swipe2.children[i]
+                            if(obj.url === url){
+                                pageIndex = i
+                                break
+                            }
+                        }
+                        if(pageIndex !== -1){
+                            nav_swipe2.currentIndex = pageIndex
+                        }
+                    }
                 }
             }
             FluIconButton{
@@ -497,8 +565,7 @@ Item {
                 Behavior on Layout.preferredWidth {
                     NumberAnimation{
                         duration: 167
-                        easing.type: Easing.BezierSpline
+                        easing.type: Easing.InCubic
-                        easing.bezierCurve: [ 0, 0, 0, 1 ]
                     }
                 }
             }
@@ -564,39 +631,27 @@ Item {
         Behavior on anchors.leftMargin {
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.BezierSpline
+                easing.type: Easing.InCubic
-                easing.bezierCurve: [ 0, 0, 0, 1 ]
             }
         }
         StackView{
             id:nav_swipe
             anchors.fill: parent
             clip: true
+            visible: !nav_swipe2.visible
             popEnter : Transition{}
-            popExit : Transition {
+            popExit : Transition {}
-                NumberAnimation {
+            pushEnter: Transition {}
-                    properties: "y"
-                    from: 0
-                    to: nav_swipe.height
-                    duration: dontPageAnimation ? 0 : 167
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: [ 1, 0, 0, 0 ]
-                }
-            }
-            pushEnter: Transition {
-                NumberAnimation {
-                    properties: "y";
-                    from: nav_swipe.height;
-                    to: 0
-                    duration: dontPageAnimation ? 0 : 167
-                    easing.type: Easing.BezierSpline
-                    easing.bezierCurve: [ 0, 0, 0, 1 ]
-                }
-            }
             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
@@ -627,20 +682,17 @@ Item {
             }
             return "transparent"
         }
-        clip: true
         x: visible ? 0 : -width
         Behavior on width {
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.BezierSpline
+                easing.type: Easing.InCubic
-                easing.bezierCurve: [ 0, 0, 0, 1 ]
             }
         }
         Behavior on x {
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.BezierSpline
+                easing.type: Easing.InCubic
-                easing.bezierCurve: [ 0, 0, 0, 1 ]
             }
         }
         visible: {
@@ -705,7 +757,7 @@ Item {
             clip: true
             ScrollBar.vertical: FluScrollBar {}
             model:d.handleItems()
-            highlightMoveDuration: 150
+            highlightMoveDuration: 167
             highlight: Item{
                 clip: true
                 Rectangle{
@@ -808,6 +860,14 @@ Item {
                 duration: 83
             }
         }
+        Connections{
+            target: d
+            function onIsCompactChanged(){
+                if(!d.isCompact){
+                    control_popup.close()
+                }
+            }
+        }
         padding: 0
         focus: true
         contentItem: Item{
@@ -820,23 +880,49 @@ Item {
                 ScrollBar.vertical: FluScrollBar {}
                 delegate:Button{
                     id:item_button
-                    width: 160
+                    width: 180
-                    padding:10
+                    height: 38
                     focusPolicy:Qt.TabFocus
                     background: Rectangle{
                         color:  {
-                            if(hovered){
+                            if(FluTheme.dark){
-                                return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
+                                if(item_button.hovered){
+                                    return Qt.rgba(1,1,1,0.06)
+                                }
+                                return Qt.rgba(0,0,0,0)
+                            }else{
+                                if(item_button.hovered){
+                                    return Qt.rgba(0,0,0,0.03)
+                                }
+                                return Qt.rgba(0,0,0,0)
                             }
-                            return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                         }
                         FluFocusRectangle{
                             visible: item_button.activeFocus
                             radius:4
                         }
+
+                        Loader{
+                            id:item_dot_loader
+                            anchors{
+                                right: parent.right
+                                verticalCenter: parent.verticalCenter
+                                rightMargin: 10
+                            }
+                            sourceComponent: {
+                                if(model.infoBadge){
+                                    return model.infoBadge
+                                }
+                                return undefined
+                            }
+                        }
+
                     }
                     contentItem: FluText{
                         text:modelData.title
+                        elide: Text.ElideRight
+                        rightPadding: item_dot_loader.width
+                        verticalAlignment: Qt.AlignVCenter
                         anchors{
                             verticalCenter: parent.verticalCenter
                         }
@@ -858,14 +944,13 @@ Item {
             }
         }
         background: FluRectangle{
-            implicitWidth: 160
+            implicitWidth: 180
             implicitHeight: 38*Math.min(Math.max(list_view.count,1),8)
             radius: [4,4,4,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)
-
         }
         function showPopup(pos,model){
             control_popup.x = pos.x
@@ -892,10 +977,17 @@ Item {
     function getItems(){
         return nav_list.model
     }
-    function push(url,argument={}){
+
-        if(nav_swipe.currentItem && nav_swipe.currentItem.url === url){
+
-            return
+    Component{
+        id:com_placeholder
+        Item{
+            property int pageMode: FluNavigationView.SingleInstance
+            property string url
         }
+    }
+
+    function push(url,argument={}){
         let page = nav_swipe.find(function(item) {
             return item.url === url;
         })
@@ -909,16 +1001,54 @@ Item {
                     d.stackItems.pop()
                 }
                 return
+            case FluNavigationView.SingleTop:
+                if (nav_swipe.currentItem.url === url){
+                    return
+                }
+                break
             case FluNavigationView.Standard:
             default:
             }
         }
-        nav_swipe.push(url,Object.assign(argument,{url:url}))
+        var comp = Qt.createComponent(url)
-        d.stackItems.push(nav_list.model[nav_list.currentIndex])
+        if (comp.status === Component.Ready) {
+            //先判断nav_swipe2中是否有当前url数据
+            var pageIndex = -1
+            for(var i=0;i<nav_swipe2.children.length;i++){
+                var item =  nav_swipe2.children[i]
+                if(item.url === url){
+                    pageIndex = i
+                    break
+                }
+            }
+            var options = Object.assign(argument,{url:url})
+            if(pageIndex!==-1){
+                nav_swipe2.currentIndex = pageIndex
+                nav_swipe.push(com_placeholder,options)
+            }else{
+                var obj  = comp.createObject(nav_swipe,options)
+                if(obj.pageMode === FluNavigationView.SingleInstance){
+                    nav_swipe.push(com_placeholder,options)
+                    nav_swipe2.children.push(obj)
+                    nav_swipe2.currentIndex = nav_swipe2.count - 1
+                }else{
+                    nav_swipe.push(obj)
+                }
+            }
+            d.stackItems.push(nav_list.model[nav_list.currentIndex])
+        }else{
+            console.error(comp.errorString())
+        }
     }
     function getCurrentIndex(){
         return nav_list.currentIndex
     }
+    function getCurrentUrl(){
+        if(nav_swipe.currentItem){
+            return nav_swipe.currentItem.url
+        }
+        return undefined
+    }
     function startPageByItem(data){
         var items = getItems()
         for(var i=0;i<items.length;i++){

src/imports/FluentUI/Controls/FluObject.qml

@@ -3,6 +3,6 @@ import QtQuick.Controls
 import FluentUI
 
 QtObject {
-    default property list<QtObject> children;
+    default property list<QtObject> children
-    id:flu_object;
+    id:control
 }

src/imports/FluentUI/Controls/FluPage.qml

@@ -0,0 +1,22 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Window
+import FluentUI
+
+Item {
+    property int pageMode: FluNavigationView.SingleTop
+    property string url : ""
+    id: control
+    opacity: visible
+    visible: false
+    Behavior on opacity{
+        NumberAnimation{
+            duration: 83
+        }
+    }
+    Component.onCompleted: {
+        visible = true
+    }
+
+}

src/imports/FluentUI/Controls/FluPagination.qml

@@ -9,9 +9,9 @@ Item {
     property string nextText: "下一页>"
     property int pageCurrent: 0
     property int itemCount: 0
+    property int pageButtonCount: 5
     property int pageCount: itemCount>0?Math.ceil(itemCount/__itemPerPage):0
     property int __itemPerPage: 10
-    property int pageButtonCount: 5
     property int __pageButtonHalf: Math.floor(pageButtonCount/2)+1
     id: control
     implicitHeight: 40
@@ -34,7 +34,6 @@ Item {
             FluToggleButton{
                 property int pageNumber:1
                 visible: control.pageCount>0
-                enabled: control.pageCurrent>1
                 checked: pageNumber === control.pageCurrent
                 text:String(pageNumber)
                 clickListener:function() {

src/imports/FluentUI/Controls/FluPaneItem.qml

@@ -9,12 +9,14 @@ QtObject {
     property int order : 0
     property int icon
     property Component cusIcon
+    property Component infoBadge
     property bool recentlyAdded: false
     property bool recentlyUpdated: false
     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/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)
@@ -15,7 +16,7 @@ TextField{
     width: 300
     enabled: !disabled
     color: {
-        if(disabled){
+        if(!enabled){
             return disableColor
         }
         return normalColor
@@ -25,7 +26,7 @@ TextField{
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
     selectionColor: FluTheme.primaryColor.lightest
     placeholderTextColor: {
-        if(disabled){
+        if(!enabled){
             return placeholderDisableColor
         }
         if(focus){
@@ -50,6 +51,12 @@ TextField{
             }
         }
     }
+    Keys.onEnterPressed: {
+        control.commit()
+    }
+    Keys.onBackPressed: {
+        control.commit()
+    }
     FluIconButton{
         id:btn_reveal
         iconSource:FluentIcons.RevealPasswordMedium

src/imports/FluentUI/Controls/FluPivot.qml

@@ -27,7 +27,8 @@ Item {
         clip: true
         spacing: 20
         interactive: false
-        orientation:ListView.Horizontal
+        orientation: ListView.Horizontal
+        highlightMoveDuration: 167
         highlight: Item{
             clip: true
             Rectangle{
@@ -38,7 +39,8 @@ Item {
                 y:37
                 Behavior on width {
                     NumberAnimation{
-                        duration: 150
+                        duration: 167
+                        easing.type: Easing.InCubic
                     }
                 }
             }
@@ -61,11 +63,6 @@ Item {
                         return normalColor
                     }
                 }
-                transitions: Transition {
-                    NumberAnimation{
-                        duration: 400;
-                    }
-                }
             }
             onClicked: {
                 nav_list.currentIndex = index

src/imports/FluentUI/Controls/FluRadioButton.qml

@@ -13,6 +13,9 @@ Button {
     property color hoverColor: checked ? FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(1,1,1,1) : FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(222/255,222/255,222/255,1)
     property color disableColor: checked ? FluTheme.dark ? Qt.rgba(159/255,159/255,159/255,1) : Qt.rgba(159/255,159/255,159/255,1)  : FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(222/255,222/255,222/255,1)
     property alias textColor: btn_text.textColor
+    property real size: 18
+    property bool textRight: true
+    property real textSpacing: 6
     property var clickListener : function(){
         checked = !checked
     }
@@ -33,28 +36,30 @@ Button {
     font:FluTextStyle.Body
     onClicked: clickListener()
     contentItem: RowLayout{
+        spacing: control.textSpacing
+        layoutDirection:control.textRight ? Qt.LeftToRight : Qt.RightToLeft
         Rectangle{
             id:rect_check
-            width: 20
+            width: control.size
-            height: 20
+            height: control.size
-            radius: 10
+            radius: size/2
             border.width: {
-                if(checked&&disabled){
+                if(checked&&!enabled){
-                    return 4
+                    return 3
                 }
                 if(pressed){
-                    if(checked){
-                        return 5
-                    }
-                    return 1
-                }
-                if(hovered){
                     if(checked){
                         return 4
                     }
                     return 1
                 }
-                return checked ? 5 : 1
+                if(hovered){
+                    if(checked){
+                        return 3
+                    }
+                    return 1
+                }
+                return checked ? 4 : 1
             }
             Behavior on border.width {
                 NumberAnimation{
@@ -64,13 +69,13 @@ Button {
                 }
             }
             border.color: {
-                if(disabled){
+                if(!enabled){
                     return borderDisableColor
                 }
                 return  borderNormalColor
             }
             color:{
-                if(disabled){
+                if(!enabled){
                     return disableColor
                 }
                 if(hovered){

src/imports/FluentUI/Controls/FluRadioButtons.qml

@@ -0,0 +1,30 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Basic
+import QtQuick.Layouts
+import FluentUI
+
+ColumnLayout {
+    default property alias buttons: control.data
+    property int currentIndex : -1
+    id:control
+    onCurrentIndexChanged: {
+        for(var i = 0;i<buttons.length;i++){
+            buttons[i].checked = false
+        }
+        buttons[currentIndex].checked = true
+    }
+    Component.onCompleted: {
+        for(var i = 0;i<buttons.length;i++){
+            buttons[i].clickListener = function(){
+                for(var i = 0;i<buttons.length;i++){
+                    var button = buttons[i]
+                    if(this === button){
+                        currentIndex = i
+                    }
+                }
+            }
+        }
+        currentIndex = 0
+    }
+}

src/imports/FluentUI/Controls/FluRemoteLoader.qml

@@ -2,25 +2,35 @@ import QtQuick
 import QtQuick.Controls
 import FluentUI
 
-Item {
+FluStatusView {
-    id:control
     property url source: ""
-
+    property bool lazy: false
+    color:"transparent"
+    id:control
+    onErrorClicked: {
+        reload()
+    }
+    Component.onCompleted: {
+        if(!lazy){
+            loader.source = control.source
+        }
+    }
     Loader{
         id:loader
         anchors.fill: parent
-        source: control.source
         asynchronous: true
+        onStatusChanged: {
+            if(status === Loader.Error){
+                control.statusMode = FluStatusView.Error
+            }else if(status === Loader.Loading){
+                control.statusMode = FluStatusView.Loading
+            }else{
+                control.statusMode = FluStatusView.Success
+            }
+        }
     }
-
-    FluProgressRing{
-        anchors.centerIn: parent
-        visible: loader.status === Loader.Loading
-    }
-
     function reload(){
         var timestamp = Date.now();
         loader.source = control.source+"?"+timestamp
     }
-
 }

src/imports/FluentUI/Controls/FluScrollIndicator.qml

@@ -0,0 +1,49 @@
+import QtQuick
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+T.ScrollIndicator {
+    id: control
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+
+    padding: 2
+
+    contentItem: Rectangle {
+        implicitWidth: 2
+        implicitHeight: 2
+
+        color: control.palette.mid
+        visible: control.size < 1.0
+        opacity: 0.0
+
+        states: State {
+            name: "active"
+            when: control.active
+            PropertyChanges {
+                target: control
+                contentItem.opacity: 0.75
+            }
+        }
+
+        transitions: [
+            Transition {
+                from: "active"
+                SequentialAnimation {
+                    PauseAnimation {
+                        duration: 450
+                    }
+                    NumberAnimation {
+                        target: control.contentItem
+                        duration: 200
+                        property: "opacity"
+                        to: 0.0
+                    }
+                }
+            }
+        ]
+    }
+}

src/imports/FluentUI/Controls/FluScrollablePage.qml

@@ -4,7 +4,7 @@ import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
 
-Item {
+FluPage {
     property alias title: text_title.text
     default property alias content: container.data
     property int spacing : 0
@@ -12,14 +12,12 @@ Item {
     property int topPadding: 0
     property int rightPadding: 10
     property int bottomPadding: 10
-    property int pageMode: FluNavigationView.Standard
-    property string url: ''
     id:control
     FluText{
         id:text_title
         font: FluTextStyle.Title
         visible: text !== ""
-        height: visible ? implicitHeight : 0
+        height: visible ? contentHeight : 0
         padding: 0
         anchors{
             top: parent.top

src/imports/FluentUI/Controls/FluSlider.qml

@@ -1,131 +1,72 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.impl
-import Qt5Compat.GraphicalEffects
+import QtQuick.Templates as T
 import FluentUI
 
-Item{
+T.Slider {
-    property int size: 180
+    property bool tooltipEnabled: true
-    property int dotSize: 24
+    id: control
-    property int value: 50
+    to:100
-    property int maxValue: 100
+    stepSize:1
-    property bool vertical: false
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-    property bool tipEnabled : true
+                            implicitHandleWidth + leftPadding + rightPadding)
-    property var onLineClickFunc
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-    signal pressed
+                             implicitHandleHeight + topPadding + bottomPadding)
-    signal released
+    padding: 6
-    id:root
+    handle: Rectangle {
-    height: control.height
+        x: control.leftPadding + (control.horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2)
-    width: control.width
+        y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))
-    rotation: vertical ? 180 : 0
+        implicitWidth: 24
-    Component.onCompleted: {
+        implicitHeight: 24
-        seek(value)
+        radius: 12
-    }
-    MouseArea{
-        id:mouse_line
-        anchors.centerIn: control
-        width: vertical ? 10 : control.width
-        height: vertical ? control.height : 10
-        hoverEnabled: true
-        onClicked:
-            (mouse) => {
-                var val;
-                if(vertical){
-                    val = mouse.y*maxValue/control.height
-                }else{
-                    val = mouse.x*maxValue/control.width
-                }
-                if(onLineClickFunc){
-                    onLineClickFunc(val)
-                }else{
-                    seek(val)
-                }
-            }
-    }
-    Rectangle {
-        id: control
-        width: vertical ? 4 :size
-        height:  vertical ? size : 4
-        radius: 2
-        anchors.verticalCenter: parent.verticalCenter
-        color:FluTheme.dark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
-        Rectangle{
-            id:rect
-            radius: 2.5
-            width: vertical ? 5 : control.width*(value/maxValue)
-            height: vertical ? control.height*(value/maxValue) :  5
-            color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
-        }
-    }
-    Rectangle{
-        id:dot
-        width: dotSize
-        height: dotSize
-        FluShadow{
-            radius: dotSize/2
-        }
-        radius: dotSize/2
-        anchors.verticalCenter: vertical ? undefined : parent.verticalCenter
-        anchors.horizontalCenter: vertical ? parent.horizontalCenter : undefined
         color:FluTheme.dark ? Qt.rgba(69/255,69/255,69/255,1) :Qt.rgba(1,1,1,1)
+        FluShadow{
+            radius: 12
+        }
         Rectangle{
-            width: dotSize
+            width: 24
-            height: dotSize
+            height: 24
-            radius: dotSize/2
+            radius: 12
             color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
             anchors.centerIn: parent
             scale: {
-                if(control_mouse.pressed){
+                if(control.pressed){
                     return 4/10
                 }
-                return control_mouse.containsMouse || mouse_line.containsMouse  ? 6/10 : 5/10
+                return control.hovered ? 6/10 : 5/10
             }
             Behavior on scale {
                 NumberAnimation{
-                    duration: 150
+                    duration: 167
                 }
             }
         }
-        MouseArea{
-            id:control_mouse
-            anchors.fill: parent
-            hoverEnabled: true
-            drag {
-                target: dot
-                axis: vertical ? Drag.YAxis : Drag.XAxis
-                minimumX: vertical ? 0 : -dotSize/2
-                maximumX: vertical ? 0 : (control.width - dotSize/2)
-                minimumY: vertical ? -dotSize/2 : 0
-                maximumY: vertical ? (control.height - dotSize/2) : 0
-            }
-            onPressed: {
-                if(tipEnabled){
-                    tool_tip.visible  =  true
-                }
-                root.pressed()
-            }
-            onReleased: {
-                tool_tip.visible  =  false
-                root.released()
-            }
-        }
-        FluTooltip{
-            id:tool_tip
-            text:String(root.value)
-            y: vertical ? 32 : -40
-        }
     }
-    function seek(val){
+    background: Item {
-        if(vertical){
+        x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2)
-            dot.y =val/maxValue*control.height - dotSize/2
+        y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0)
-            root.value = Qt.binding(function(){
+        implicitWidth: control.horizontal ? 180 : 6
-                return (dot.y+dotSize/2)/control.height*maxValue
+        implicitHeight: control.horizontal ? 6 : 180
-            })
+        width: control.horizontal ? control.availableWidth : implicitWidth
-        }else{
+        height: control.horizontal ? implicitHeight : control.availableHeight
-            dot.x =val/maxValue*control.width - dotSize/2
+        Rectangle{
-            root.value = Qt.binding(function(){
+            anchors.fill: parent
-                return (dot.x+dotSize/2)/control.width*maxValue
+            anchors.margins: 1
-            })
+            radius: 2
+            color:FluTheme.dark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
         }
+        scale: control.horizontal && control.mirrored ? -1 : 1
+        Rectangle {
+            y: control.horizontal ? 0 : control.visualPosition * parent.height
+            width: control.horizontal ? control.position * parent.width : 6
+            height: control.horizontal ? 6 : control.position * parent.height
+            radius: 3
+            color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
+        }
+    }
+    FluTooltip{
+        parent: control.handle
+        visible: control.tooltipEnabled && control.pressed
+        text:String(control.value)
     }
 }
-

src/imports/FluentUI/Controls/FluStatusView.qml

@@ -13,6 +13,11 @@ Item{
     }
     default property alias content: container.data
     property int statusMode: FluStatusView.Loading
+    property string loadingText:"正在加载..."
+    property string emptyText: "空空如也"
+    property string errorText: "页面出错了.."
+    property string errorButtonText: "重新加载"
+    property color 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)
     signal errorClicked
     Item{
         id:container
@@ -28,6 +33,7 @@ Item{
         Behavior on opacity {
             NumberAnimation  { duration: 83 }
         }
+        color:control.color
         ColumnLayout{
             anchors.centerIn: parent
             visible: statusMode === FluStatusView.Loading
@@ -36,7 +42,7 @@ Item{
                 Layout.alignment: Qt.AlignHCenter
             }
             FluText{
-                text:"正在加载..."
+                text:control.loadingText
                 Layout.alignment: Qt.AlignHCenter
             }
         }
@@ -46,6 +52,7 @@ Item{
         border.width: 0
         anchors.fill: container
         visible: opacity
+        color:control.color
         opacity: statusMode === FluStatusView.Empty
         Behavior on opacity {
             NumberAnimation  { duration: 83 }
@@ -54,7 +61,7 @@ Item{
             anchors.centerIn: parent
             visible: statusMode === FluStatusView.Empty
             FluText{
-                text:"空空如也"
+                text:control.emptyText
                 font: FluTextStyle.BodyStrong
                 Layout.alignment: Qt.AlignHCenter
             }
@@ -65,6 +72,7 @@ Item{
         border.width: 0
         anchors.fill: container
         visible: opacity
+        color:control.color
         opacity: statusMode === FluStatusView.Error
         Behavior on opacity {
             NumberAnimation  { duration: 83 }
@@ -72,14 +80,14 @@ Item{
         ColumnLayout{
             anchors.centerIn: parent
             FluText{
-                text:"页面出错了..."
+                text:control.errorText
                 font: FluTextStyle.BodyStrong
                 Layout.alignment: Qt.AlignHCenter
             }
             FluFilledButton{
                 id:btn_error
                 Layout.alignment: Qt.AlignHCenter
-                text:"重新加载"
+                text:control.errorButtonText
                 onClicked:{
                     control.errorClicked()
                 }

src/imports/FluentUI/Controls/FluTabView.qml

@@ -110,6 +110,11 @@ Item {
                         anchors.fill: parent
                         hoverEnabled: true
                     }
+                    FluTooltip{
+                        visible: item_mouse_hove.containsMouse
+                        text:item_text.text
+                        delay: 1000
+                    }
                     MouseArea{
                         id:item_mouse_drag
                         anchors.fill: parent
@@ -242,11 +247,6 @@ Item {
                             Layout.preferredWidth: visible?item_container.width - 41 - item_btn_close.width:0
                             elide: Text.ElideRight
                             Layout.alignment: Qt.AlignVCenter
-                            FluTooltip{
-                                visible: item_mouse_hove.containsMouse
-                                text:item_text.text
-                                delay: 1000
-                            }
                         }
                     }
                     FluIconButton{

src/imports/FluentUI/Controls/FluTableModelColumn.qml

@@ -0,0 +1,5 @@
+import Qt.labs.qmlmodels
+
+TableModelColumn{
+
+}

src/imports/FluentUI/Controls/FluTableView.qml

@@ -2,234 +2,364 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import QtQuick.Layouts
+import Qt.labs.qmlmodels
 import FluentUI
 
-Item {
+Rectangle {
-    property var columns : []
+    property var columnSource
-    property var dataSource : []
+    property var dataSource
-    property int pageCurrent: 1
-    property int itemCount: 1000
-    property int pageCount: 10
-    property int itemHeight: 56
-    property bool pageVisible: true
-    signal requestPage(int page,int count)
     id:control
-    implicitHeight: layout_table.height
+    color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+    onColumnSourceChanged: {
+        if(columnSource.length!==0){
+            var com_column = Qt.createComponent("FluTableModelColumn.qml")
+            if (com_column.status === Component.Ready) {
+                var columns= []
+                var header_rows = {}
+                columnSource.forEach(function(item){
+                    var column = com_column.createObject(table_model,{display:item.dataIndex});
+                    columns.push(column)
+                    header_rows[item.dataIndex] = item.title
+                })
+                table_model.columns = columns
+                header_model.columns = columns
+                d.header_rows = [header_rows]
+            }
+        }
+    }
     QtObject{
         id:d
-        property int columnsWidth: parent.width
+        property var header_rows:[]
-    }
-    MouseArea{
-        anchors.fill: parent
-        preventStealing: true
-    }
-    ListModel{
-        id:model_columns
-    }
-    ListModel{
-        id:model_data_source
-    }
-    onColumnsChanged: {
-        model_columns.clear()
-        model_columns.append(columns)
-        var w = 0
-        for(var i=0;i<model_columns.count;i++){
-            var item = model_columns.get(i)
-            w=w+item.width
-        }
-        d.columnsWidth = w
     }
     onDataSourceChanged: {
-        model_data_source.clear()
+        table_model.clear()
-        model_data_source.append(dataSource)
+        dataSource.forEach(function(item){
+            table_model.appendRow(item)
+        })
     }
-    Flickable{
+    TableModel {
-        id:layout_flickable
+        id:table_model
-        height: layout_table.height
-        anchors{
-            top: parent.top
-            left: parent.left
-            right: parent.right
-        }
-        contentWidth: layout_table.width
-        clip:true
-        ScrollBar.horizontal: FluScrollBar {
-        }
-        Rectangle{
-            anchors.fill: layout_table
-            radius: 5
-            color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-        }
-        ListView{
-            id:layout_table
-            height: contentHeight
-            width: Math.max(layout_flickable.width,d.columnsWidth)
-            clip:true
-            interactive: false
-            header: FluRectangle{
-                id:layout_columns
-                height: control.itemHeight
-                width: parent.width
-                color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
-                radius: [5,5,0,0]
-                Row{
-                    id:list_columns
-                    spacing: 0
-                    anchors.fill: parent
-                    Repeater{
-                        model: model_columns
-                        delegate: Item{
-                            height: list_columns.height
-                            width: model.width
-                            FluText{
-                                text:model.title
-                                wrapMode: Text.WordWrap
-                                anchors{
-                                    verticalCenter: parent.verticalCenter
-                                    left: parent.left
-                                    leftMargin: 14
-                                }
-                                font: FluTextStyle.BodyStrong
-                            }
-                            FluDivider{
-                                width: 1
-                                height: 40
-                                anchors.right: parent.right
-                                anchors.verticalCenter: parent.verticalCenter
-                                visible: index !== model_columns.count-1
-                            }
-                        }
-                    }
-                }
-            }
-            footer: Item{
-                height: pageVisible ? 50 : 0
-                clip: true
-                width: layout_table.width
-                FluPagination{
-                    id:pagination
-                    height: 40
-                    pageCurrent: control.pageCurrent
-                    onPageCurrentChanged: control.pageCurrent = pageCurrent
-                    itemCount: control.itemCount
-                    pageCount: control.pageCount
-                    onRequestPage:
-                        (page,count)=> {
-                            control.requestPage(page,count)
-                        }
-                    anchors{
-                        top: parent.top
-                        right: parent.right
-                    }
-                    Connections{
-                        target: control
-                        function onPageCurrentChanged(){
-                            if (control.pageCurrent!==pagination.pageCurrent)
-                            {
-                                pagination.calcNewPage(control.pageCurrent)
-                            }
-                        }
-                    }
-                }
-            }
-            model:model_data_source
-            delegate: Control{
-                id:item_control
-                height: table_row.maxHeight
-                width: layout_table.width
-                property var model_values : getObjectValues(index)
-                property var itemObject: getObject(index)
-                property var listModel: model
-                Rectangle{
-                    anchors.fill: parent
-                    color: {
-                        if(item_control.hovered){
-                            return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
-                        }
-                        return FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(1,1,1,1)
-                    }
-                }
-                Row{
-                    id: table_row
-                    spacing: 0
-                    anchors.fill: parent
-                    property int maxHeight: itemHeight
-                    Repeater{
-                        model: model_values
-                        delegate:Item{
-                            height: table_row.maxHeight
-                            width: modelData.width
-                            Loader{
-                                property var model : modelData
-                                property var dataModel : listModel
-                                property var dataObject : itemObject
-                                anchors.fill: parent
-                                sourceComponent: {
-                                    if(model.itemData instanceof Component){
-                                        return model.itemData
-                                    }
-                                    return com_text
-                                }
-                                onHeightChanged:
-                                {
-                                    table_row.maxHeight = Math.max(table_row.maxHeight,height,itemHeight)
-                                    parent.height = table_row.maxHeight
-                                    table_row.parent.height = table_row.maxHeight
-                                }
-                            }
-                        }
-                    }
-                }
-                FluDivider{
-                    width: parent.width
-                    height: 1
-                    anchors.right: parent.right
-                    anchors.bottom: parent.bottom
-                }
-            }
-        }
     }
     Component{
-        id:com_text
+        id:com_edit
-        Item{
+        FluTextBox {
-            FluCopyableText{
+            anchors.fill: parent
-                id:table_value
+            text: display
-                text:String(model.itemData)
+            verticalAlignment: TextInput.AlignVCenter
-                width: Math.min(parent.width - 14,implicitWidth)
+            Component.onCompleted: {
-                wrapMode: Text.WordWrap
+                forceActiveFocus()
-                onImplicitHeightChanged: parent.parent.parent.height = Math.max(implicitHeight + 20,itemHeight)
+                selectAll()
-                anchors{
+            }
-                    verticalCenter: parent.verticalCenter
+            onCommit: {
-                    left: parent.left
+                display = text
-                    leftMargin: 14
+                tableView.closeEditor()
+            }
+        }
+    }
+
+    ScrollView{
+        id:scroll_table
+        anchors.left: header_vertical.right
+        anchors.top: header_horizontal.bottom
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AlwaysOff
+        TableView {
+            id:table_view
+            ListModel{
+                id:model_columns
+            }
+            boundsBehavior: Flickable.StopAtBounds
+            ScrollBar.horizontal: FluScrollBar{}
+            ScrollBar.vertical: FluScrollBar{}
+            selectionModel: ItemSelectionModel {
+                id:selection_model
+            }
+            columnWidthProvider: function(column) {
+                var w = columnSource[column].width
+                if(column === item_loader.column){
+                    item_loader.width = w
                 }
-                MouseArea{
+                if(column === item_loader.column-1){
-                    id:item_mouse
+                    let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
-                    hoverEnabled: true
+                    if(cellItem){
+                        let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
+                        item_loader.x = table_view.contentX + cellPosition.x
+                    }
+                }
+                return w
+            }
+            rowHeightProvider: function(row) {
+                var h = table_model.getRow(row).height
+                if(row === item_loader.row){
+                    item_loader.height = h
+                }
+                if(row === item_loader.row-1){
+                    let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
+                    if(cellItem){
+                        let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
+                        item_loader.y = table_view.contentY + cellPosition.y
+                    }
+                }
+                return h
+            }
+            model: table_model
+            clip: true
+            delegate: Rectangle {
+                required property bool selected
+                required property bool current
+                property var readOnly: columnSource[column].readOnly
+                color: selected ? FluTheme.primaryColor.lightest: (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06))
+                implicitHeight: 40
+                implicitWidth: columnSource[column].width
+                TapHandler{
+                    acceptedButtons: Qt.LeftButton
+                    onDoubleTapped: {
+                        if(readOnly){
+                            return
+                        }
+                        item_loader.sourceComponent = obtEditDelegate(column,row)
+                        var index = table_view.index(row,column)
+                    }
+                    onTapped: {
+                        if(!current){
+                            item_loader.sourceComponent = null
+                        }
+                    }
+                }
+                FluText {
+                    text: display
                     anchors.fill: parent
-                    cursorShape: Qt.IBeamCursor
+                    anchors.margins: 10
-                    acceptedButtons: Qt.NoButton
+                    elide: Text.ElideRight
+                    verticalAlignment: Text.AlignVCenter
                 }
-                FluTooltip{
+            }
-                    visible: item_mouse.containsMouse
+        }
-                    text:parent.text
+        Loader{
-                    delay: 1000
+            id:item_loader
+            z:2
+            property var display
+            property int column
+            property int row
+            property var tableView: control
+            onDisplayChanged: {
+                table_model.setData(table_view.index(row,column),"display",display)
+            }
+        }
+    }
+
+    function obtEditDelegate(column,row){
+        var display = table_model.data(table_view.index(row,column),"display")
+        var cellItem = table_view.itemAtCell(column, row)
+        var cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
+        item_loader.column = column
+        item_loader.row = row
+        item_loader.x = table_view.contentX + cellPosition.x
+        item_loader.y = table_view.contentY + cellPosition.y
+        item_loader.width = table_view.columnWidthProvider(column)
+        item_loader.height = table_view.rowHeightProvider(row)
+        item_loader.display = display
+        var obj =columnSource[column].editDelegate
+        if(obj){
+            return obj
+        }
+        return com_edit
+    }
+
+    Component{
+        id:com_handle
+        FluControl {
+            width: 24
+            height: 24
+            background: Rectangle{
+                radius: 12
+                color: FluTheme.dark ? Qt.rgba(69/255,69/255,69/255,1) :Qt.rgba(1,1,1,1)
+            }
+            visible: SelectionRectangle.control.active
+            FluShadow{
+                radius: 12
+            }
+            Rectangle{
+                width: 24
+                height: 24
+                radius: 12
+                scale: pressed?4/10:hovered?6/10:5/10
+                color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
+                anchors.centerIn: parent
+                Behavior on scale {
+                    NumberAnimation{
+                        duration: 167
+                    }
                 }
             }
         }
     }
-    function getObject(index){
+    SelectionRectangle {
-        return model_data_source.get(index)
+        target: {
-    }
+            if(item_loader.sourceComponent){
-    function getObjectValues(index) {
+                return null
-        var obj = model_data_source.get(index)
+            }
-        if(!obj)
+            return table_view
-            return
-        var data = []
-        for(var i=0;i<model_columns.count;i++){
-            var item = model_columns.get(i)
-            data.push({itemData:obj[item.dataIndex],width:item.width})
         }
-        return data;
+        bottomRightHandle:com_handle
+        topLeftHandle: com_handle
     }
+    TableView {
+        id: header_horizontal
+        model: TableModel{
+            id:header_model
+            rows: d.header_rows
+        }
+        syncDirection: Qt.Horizontal
+        anchors.left: scroll_table.left
+        anchors.top: parent.top
+        implicitWidth: syncView ? syncView.width : 0
+        implicitHeight: Math.max(1, contentHeight)
+        syncView: table_view
+        boundsBehavior: Flickable.StopAtBounds
+        clip: true
+        delegate: Rectangle {
+            readonly property real cellPadding: 8
+            readonly property var obj : columnSource[column]
+            implicitWidth: column_text.implicitWidth + (cellPadding * 2)
+            implicitHeight: Math.max(header_horizontal.height, column_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: column_text
+                text: display
+                width: parent.width
+                height: parent.height
+                font.bold: true
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+            }
+            TapHandler{
+                onDoubleTapped: {
+                    selection_model.clear()
+                    for(var i=0;i<=table_view.rows;i++){
+                        selection_model.select(table_view.index(i,column),ItemSelectionModel.Select)
+                    }
+                }
+            }
+            MouseArea{
+                property point clickPos: "0,0"
+                height: parent.height
+                width: 4
+                anchors.right: parent.right
+                acceptedButtons: Qt.LeftButton
+                visible: !(obj.width === obj.maximumWidth && obj.width === obj.maximumWidth)
+                cursorShape: Qt.SplitHCursor
+                preventStealing: true
+                propagateComposedEvents: true
+                onPressed :
+                    (mouse)=>{
+                        FluTools.setOverrideCursor(Qt.SplitHCursor)
+                        clickPos = Qt.point(mouse.x, mouse.y)
+                    }
+                onReleased:{
+                    FluTools.restoreOverrideCursor()
+                }
+                onPositionChanged:
+                    (mouse)=>{
+                        var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y)
+                        var minimumWidth = obj.minimumWidth
+                        var maximumWidth = obj.maximumWidth
+                        if(!minimumWidth){
+                            minimumWidth = 100
+                        }
+                        if(!maximumWidth){
+                            maximumWidth = 65535
+                        }
+                        obj.width = Math.min(Math.max(minimumWidth, obj.width + delta.x),maximumWidth)
+                        table_view.forceLayout()
+                    }
+            }
+        }
+    }
+    TableView {
+        id: header_vertical
+        boundsBehavior: Flickable.StopAtBounds
+        anchors.top: scroll_table.top
+        anchors.left: parent.left
+        implicitWidth: Math.max(1, contentWidth)
+        implicitHeight: syncView ? syncView.height : 0
+        syncDirection: Qt.Vertical
+        syncView: table_view
+        clip: true
+        model: TableModel{
+            TableModelColumn {}
+            rows: {
+                if(dataSource)
+                    return dataSource
+                return []
+            }
+        }
+        delegate: Rectangle{
+            readonly property real cellPadding: 8
+            readonly property var obj : table_model.getRow(row)
+            implicitWidth: Math.max(header_vertical.width, row_text.implicitWidth + (cellPadding * 2))
+            implicitHeight: row_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:row_text
+                anchors.centerIn: parent
+                text: row + 1
+            }
+            TapHandler{
+                onDoubleTapped: {
+                    selection_model.clear()
+                    for(var i=0;i<=columnSource.length;i++){
+                        selection_model.select(table_view.index(row,i),ItemSelectionModel.Select)
+                    }
+                }
+            }
+            MouseArea{
+                property point clickPos: "0,0"
+                height: 4
+                width: parent.width
+                anchors.bottom: parent.bottom
+                acceptedButtons: Qt.LeftButton
+                cursorShape: Qt.SplitVCursor
+                preventStealing: true
+                visible: !(obj.height === obj.minimumHeight && obj.width === obj.maximumHeight)
+                propagateComposedEvents: true
+                onPressed :
+                    (mouse)=>{
+                        FluTools.setOverrideCursor(Qt.SplitVCursor)
+                        clickPos = Qt.point(mouse.x, mouse.y)
+                    }
+                onReleased:{
+                    FluTools.restoreOverrideCursor()
+                }
+                onPositionChanged:
+                    (mouse)=>{
+                        var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y)
+                        var minimumHeight = obj.minimumHeight
+                        var maximumHeight = obj.maximumHeight
+                        if(!minimumHeight){
+                            minimumHeight = 40
+                        }
+                        if(!maximumHeight){
+                            maximumHeight = 65535
+                        }
+                        obj.height = Math.min(Math.max(minimumHeight, obj.height + delta.y),maximumHeight)
+                        table_model.setRow(row,obj)
+                        table_view.forceLayout()
+                    }
+            }
+        }
+    }
+
+    function closeEditor(){
+        item_loader.sourceComponent = null
+    }
+
+    function resetPosition(){
+       table_view.positionViewAtCell(Qt.point(0, 0),TableView.AlignTop|TableView.AlignLeft)
+    }
+
 }

src/imports/FluentUI/Controls/FluTextBox.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)
@@ -15,7 +16,7 @@ TextField{
     width: 300
     enabled: !disabled
     color: {
-        if(disabled){
+        if(!enabled){
             return disableColor
         }
         return normalColor
@@ -24,7 +25,7 @@ TextField{
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
     selectionColor: FluTheme.primaryColor.lightest
     placeholderTextColor: {
-        if(disabled){
+        if(!enabled){
             return placeholderDisableColor
         }
         if(focus){
@@ -32,6 +33,12 @@ TextField{
         }
         return placeholderNormalColor
     }
+    Keys.onEnterPressed: {
+        control.commit()
+    }
+    Keys.onReturnPressed: {
+        control.commit()
+    }
     selectByMouse: true
     rightPadding: icon_end.visible ? 50 : 30
     background: FluTextBoxBackground{
@@ -73,6 +80,5 @@ TextField{
         id:menu
         inputItem: control
     }
-
 }
 

src/imports/FluentUI/Controls/FluTextBoxMenu.qml

@@ -9,12 +9,10 @@ FluMenu{
     property string selectAllText : "全选"
     property var inputItem
     id:menu
-    focus:false
+    animEnabled: false
-    enableAnimation:false
+    width: 120
     onVisibleChanged: {
-        if(visible){
+        inputItem.forceActiveFocus()
-            inputItem.forceActiveFocus()
-        }
     }
     Connections{
         target: inputItem

src/imports/FluentUI/Controls/FluTextButton.qml

@@ -10,9 +10,13 @@ Button {
     property color hoverColor: FluTheme.dark ? Qt.darker(normalColor,1.15) : Qt.lighter(normalColor,1.15)
     property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.3) : Qt.lighter(normalColor,1.3)
     property color disableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
+    property color backgroundHoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
+    property color backgroundPressedColor: FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
+    property color backgroundNormalColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
+    property color backgroundDisableColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
     property bool textBold: true
     property color textColor: {
-        if(disabled){
+        if(!enabled){
             return disableColor
         }
         if(pressed){
@@ -21,12 +25,25 @@ Button {
         return hovered ? hoverColor :normalColor
     }
     id: control
-    horizontalPadding:2
+    horizontalPadding:6
     enabled: !disabled
-    Keys.onSpacePressed: control.visualFocus&&clicked()
+    font:FluTextStyle.Body
-    background: Item{
+    background: Rectangle{
         implicitWidth: 28
         implicitHeight: 28
+        radius: 4
+        color: {
+            if(!enabled){
+                return backgroundDisableColor
+            }
+            if(pressed){
+                return backgroundPressedColor
+            }
+            if(hovered){
+                return backgroundHoverColor
+            }
+            return backgroundNormalColor
+        }
         FluFocusRectangle{
             visible: control.visualFocus
             radius:8
@@ -40,9 +57,9 @@ Button {
     contentItem: FluText {
         id:btn_text
         text: control.text
+        font: control.font
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        font.bold: control.textBold
         color: control.textColor
     }
 }

src/imports/FluentUI/Controls/FluTimePicker.qml

@@ -5,7 +5,6 @@ import QtQuick.Window
 import FluentUI
 
 Rectangle {
-
     enum HourFormat {
         H,
         HH
@@ -13,11 +12,10 @@ Rectangle {
     property color dividerColor: FluTheme.dark ? Qt.rgba(77/255,77/255,77/255,1) : Qt.rgba(239/255,239/255,239/255,1)
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
-    property var window : Window.window
     property int hourFormat: FluTimePicker.H
     property int isH: hourFormat === FluTimePicker.H
-
+    property var current
-    id:root
+    id:control
     color: {
         if(mouse_area.containsMouse){
             return hoverColor
@@ -29,7 +27,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
@@ -315,8 +319,24 @@ Rectangle {
                         }
                         text: "确定"
                         onClicked: {
-                            changeFlag = false
+                            d.changeFlag = false
                             popup.close()
+                            const hours = text_hour.text
+                            const minutes = text_minute.text
+                            const period = text_ampm.text
+                            const date = new Date()
+                            var hours24 = parseInt(hours);
+                            if(control.hourFormat === FluTimePicker.H){
+                                if (hours === "12") {
+                                    hours24 = (period === "上午") ? 0 : 12;
+                                } else {
+                                    hours24 = (period === "上午") ? hours24 : hours24 + 12;
+                                }
+                            }
+                            date.setHours(hours24);
+                            date.setMinutes(parseInt(minutes));
+                            date.setSeconds(0);
+                            current = date
                         }
                     }
                 }
@@ -324,10 +344,10 @@ Rectangle {
         }
         y:35
         function showPopup() {
-            changeFlag = true
+            d.changeFlag = true
-            rowData[0] = text_hour.text
+            d.rowData[0] = text_hour.text
-            rowData[1] = text_minute.text
+            d.rowData[1] = text_minute.text
-            rowData[2] = text_ampm.text
+            d.rowData[2] = text_ampm.text
 
             var now = new Date();
 
@@ -356,27 +376,24 @@ Rectangle {
             if(isH){
                 text_ampm.text = ampm
             }
-
+            var pos = control.mapToItem(null, 0, 0)
-            var pos = root.mapToItem(null, 0, 0)
+            if(d.window.height>pos.y+control.height+container.height){
-            if(window.height>pos.y+root.height+container.height){
+                popup.y = control.height
-                popup.y = root.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_hour.text = rowData[0]
+                text_hour.text = d.rowData[0]
-                text_minute.text = rowData[1]
+                text_minute.text = d.rowData[1]
-                text_ampm.text = rowData[2]
+                text_ampm.text = d.rowData[2]
             }
         }
     }
-    property bool changeFlag: true
-    readonly property var rowData: ["","",""]
     function generateArray(start, n) {
         var arr = [];
         for (var i = start; i <= n; i++) {

src/imports/FluentUI/Controls/FluToggleButton.qml

@@ -51,7 +51,7 @@ Button {
             radius:8
         }
         color:{
-            if(disabled){
+            if(!enabled){
                 return disableColor
             }
             if(checked){
@@ -69,7 +69,7 @@ Button {
         color: {
             if(checked){
                 if(FluTheme.dark){
-                    if(disabled){
+                    if(!enabled){
                         return Qt.rgba(173/255,173/255,173/255,1)
                     }
                     return Qt.rgba(0,0,0,1)
@@ -78,7 +78,7 @@ Button {
                 }
             }else{
                 if(FluTheme.dark){
-                    if(disabled){
+                    if(!enabled){
                         return Qt.rgba(131/255,131/255,131/255,1)
                     }
                     if(!checked){
@@ -88,7 +88,7 @@ Button {
                     }
                     return Qt.rgba(1,1,1,1)
                 }else{
-                    if(disabled){
+                    if(!enabled){
                         return Qt.rgba(160/255,160/255,160/255,1)
                     }
                     if(!checked){

src/imports/FluentUI/Controls/FluToggleSwitch.qml

@@ -7,15 +7,19 @@ import FluentUI
 Button {
     property bool disabled: false
     property string contentDescription: ""
-    property color disableColor: checked ? FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(159/255,159/255,159/255,1) :FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(240/255,240/255,240/255,1)
+    property color disableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(233/255,233/255,233/255,1)
     property color checkColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
     property color hoverColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(240/255,240/255,240/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)
     property color borderNormalColor: FluTheme.dark ? Qt.rgba(161/255,161/255,161/255,1) : Qt.rgba(141/255,141/255,141/255,1)
     property color borderCheckColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
-    property color borderDisableColor: FluTheme.dark ? Qt.rgba(208/255,208/255,208/255,1) : Qt.rgba(93/255,93/255,93/255,1)
+    property color borderDisableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(200/255,200/255,200/255,1)
     property color dotNormalColor: FluTheme.dark ? Qt.rgba(208/255,208/255,208/255,1) : Qt.rgba(93/255,93/255,93/255,1)
     property color dotCheckColor: FluTheme.dark ? Qt.rgba(0/255,0/255,0/255,1) : Qt.rgba(255/255,255/255,255/255,1)
+    property color dotDisableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(150/255,150/255,150/255,1)
+    property real textSpacing: 6
+    property bool textRight: true
+    property alias textColor: btn_text.textColor
     property var clickListener : function(){
         checked = !checked
     }
@@ -31,7 +35,8 @@ Button {
     onClicked: clickListener()
     contentItem: Item{}
     background : RowLayout{
-        spacing: 0
+        spacing: control.textSpacing
+        layoutDirection:control.textRight ? Qt.LeftToRight : Qt.RightToLeft
         Rectangle {
             id:control_backgound
             width: 40
@@ -42,7 +47,7 @@ Button {
                 radius: 20
             }
             color: {
-                if(disabled){
+                if(!enabled){
                     return disableColor
                 }
                 if(checked){
@@ -55,7 +60,7 @@ Button {
             }
             border.width: 1
             border.color: {
-                if(disabled){
+                if(!enabled){
                     return borderDisableColor
                 }
                 if(checked){
@@ -73,9 +78,12 @@ Button {
                 }
                 height: 20
                 radius: 10
-                scale: hovered&!disabled ? 7/10 : 6/10
+                scale: hovered&enabled ? 7/10 : 6/10
                 anchors.verticalCenter: parent.verticalCenter
                 color: {
+                    if(!enabled){
+                        return dotDisableColor
+                    }
                     if(checked){
                         return dotCheckColor
                     }
@@ -92,28 +100,25 @@ Button {
                     NumberAnimation {
                         duration: 167
                         easing.type: Easing.BezierSpline
-                        easing.bezierCurve: [ 1, 0, 0, 0 ]
+                        easing.bezierCurve: [ 0, 0, 0, 1 ]
                     }
                 }
                 Behavior on width {
                     NumberAnimation {
                         duration: 167
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: [ 1, 0, 0, 0 ]
                     }
                 }
                 Behavior on scale {
                     NumberAnimation {
                         duration: 167
-                        easing.type: Easing.BezierSpline
-                        easing.bezierCurve: [ 1, 0, 0, 0 ]
                     }
                 }
             }
         }
         FluText{
+            id:btn_text
             text: control.text
-            Layout.leftMargin: 5
+            Layout.alignment: Qt.AlignVCenter
             visible: text !== ""
         }
     }