update

2025-07-01 23:51:48 +08:00 · 2023-03-12 22:43:13 +08:00 · 2023-03-12 22:36:31 +08:00 · 2023-03-12 22:02:12 +08:00 · 2023-03-12 21:49:11 +08:00 · 2023-03-12 14:27:46 +08:00
26 changed files with 876 additions and 314 deletions
--- a/example/AboutPage.qml
+++ b/example/AboutPage.qml
@ -34,7 +34,7 @@ FluWindow {
                fontStyle: FluText.Title
            }
            FluText{
-                text:"v1.0.4"
+                text:"v1.0.6"
                fontStyle: FluText.Body
                Layout.alignment: Qt.AlignBottom
            }
@ -70,6 +70,28 @@ FluWindow {
            }
        }

+        RowLayout{
+            spacing: 14
+            Layout.topMargin: 20
+            Layout.leftMargin: 15
+            FluText{
+                id:text_info
+                text:"如果该项目对你有作用，就请点击上方链接给一个免费的star吧！"
+                ColorAnimation {
+                        id: animation
+                        target: text_info
+                        property: "color"
+                        from: "red"
+                        to: "blue"
+                        duration: 1000
+                        running: true
+                        loops: Animation.Infinite
+                        easing.type: Easing.InOutQuad
+                    }
+            }
+        }
+
+
    }


--- a/example/App.qml
+++ b/example/App.qml
@ -15,8 +15,6 @@ Window {
            "/":"qrc:/MainPage.qml",
            "/Setting":"qrc:/SettingPage.qml",
            "/About":"qrc:/AboutPage.qml",
-            "/Installer":"qrc:/Installer.qml",
-            "/Uninstall":"qrc:/Uninstall.qml"
        }
        FluApp.initialRoute = "/"
        FluApp.run()
--- a/example/MainPage.qml
+++ b/example/MainPage.qml
@ -66,6 +66,13 @@ FluWindow {
            }
        }

+        FluPaneItem{
+            title:"DatePicker"
+            onTap:{
+                nav_view.push("qrc:/T_DatePicker.qml")
+            }
+        }
+
        FluPaneItemHeader{
            title:"Surface"
        }
--- a/example/T_Awesome.qml
+++ b/example/T_Awesome.qml
@ -47,7 +47,7 @@ FluContentPage {
            height: 80
            FluIconButton{
                id:item_icon
-                icon:modelData.icon
+                iconSource:modelData.icon
                anchors.horizontalCenter: parent.horizontalCenter
                onClicked: {
                    var text  ="FluentIcons."+modelData.name;
--- a/example/T_Buttons.qml
+++ b/example/T_Buttons.qml
@ -9,14 +9,19 @@ FluScrollablePage{

    spacing: 20

-    FluArea{
+    FluText{
        Layout.topMargin: 20
+        text:"支持Tab键切换焦点，空格键执行点击事件"
+    }
+
+    FluArea{
        width: parent.width
        height: 68
        paddings: 10

        FluButton{
-            disabled:button_switch.checked
+            disabled:button_switch.selected
+            text:"Standard Button"
            onClicked: {
                showInfo("点击StandardButton")
            }
@ -48,9 +53,10 @@ FluScrollablePage{
        paddings: 10

        FluFilledButton{
-            disabled:filled_button_switch.checked
+            disabled:filled_button_switch.selected
+            text:"Filled Button"
            onClicked: {
-              showWarning("点击FilledButton")
+                showWarning("点击FilledButton")
            }
            anchors{
                verticalCenter: parent.verticalCenter
@ -81,8 +87,8 @@ FluScrollablePage{
        paddings: 10

        FluIconButton{
-            icon:FluentIcons.ChromeCloseContrast
-            disabled:icon_button_switch.checked
+            iconSource:FluentIcons.ChromeCloseContrast
+            disabled:icon_button_switch.selected
            iconSize: 15
            anchors{
                verticalCenter: parent.verticalCenter
@ -125,8 +131,8 @@ FluScrollablePage{
                property int selecIndex : 0
                model: 3
                delegate:  FluRadioButton{
-                    checked : repeater.selecIndex===index
-                    disabled:radio_button_switch.checked
+                    selected : repeater.selecIndex===index
+                    disabled:radio_button_switch.selected
                    text:"Radio Button_"+index
                    onClicked:{
                        repeater.selecIndex = index
@ -159,7 +165,8 @@ FluScrollablePage{
        paddings: 10

        FluCheckBox{
-            disabled:icon_button_check.checked
+            disabled:check_box_switch.selected
+            text:"Check Box"
            anchors{
                verticalCenter: parent.verticalCenter
                left: parent.left
@ -174,7 +181,7 @@ FluScrollablePage{
                right: parent.right
            }
            FluToggleSwitch{
-                id:icon_button_check
+                id:check_box_switch
                Layout.alignment: Qt.AlignRight
            }
            FluText{
--- a/example/T_DatePicker.qml
+++ b/example/T_DatePicker.qml
@ -0,0 +1,61 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"TimePicker"
+
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+
+        ColumnLayout{
+
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            FluText{
+                text:"showYear=true"
+            }
+
+            FluDatePicker{
+            }
+
+        }
+    }
+
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+
+        ColumnLayout{
+
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            FluText{
+                text:"showYear=false"
+            }
+
+            FluDatePicker{
+                showYear:false
+
+            }
+
+        }
+    }
+
+}
--- a/example/T_Expander.qml
+++ b/example/T_Expander.qml
@ -26,7 +26,7 @@ FluScrollablePage{
                    property int selecIndex : 0
                    model: 3
                    delegate:  FluRadioButton{
-                        checked : repeater.selecIndex===index
+                        selected : repeater.selecIndex===index
                        text:"Radio Button_"+index
                        onClicked:{
                            repeater.selecIndex = index
--- a/example/T_Theme.qml
+++ b/example/T_Theme.qml
@ -20,7 +20,7 @@ FluScrollablePage{
                color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
                FluIcon {
                    anchors.centerIn: parent
-                    icon: FluentIcons.AcceptMedium
+                    iconSource: FluentIcons.AcceptMedium
                    iconSize: 15
                    visible: modelData === FluTheme.primaryColor
                    color: FluTheme.isDark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
@ -41,8 +41,8 @@ FluScrollablePage{
        Layout.topMargin: 20
    }
    FluToggleSwitch{
-        checked: FluTheme.isDark
-        onClickFunc:function(){
+        selected: FluTheme.isDark
+        clickFunc:function(){
            FluTheme.isDark = !FluTheme.isDark
        }
    }
@ -51,8 +51,8 @@ FluScrollablePage{
        Layout.topMargin: 20
    }
    FluToggleSwitch{
-        checked: FluTheme.isFrameless
-        onClickFunc:function(){
+        selected: FluTheme.isFrameless
+        clickFunc:function(){
            FluTheme.isFrameless = !FluTheme.isFrameless
        }
    }
@ -61,8 +61,8 @@ FluScrollablePage{
        Layout.topMargin: 20
    }
    FluToggleSwitch{
-        checked: FluTheme.isNativeText
-        onClickFunc:function(){
+        selected: FluTheme.isNativeText
+        clickFunc:function(){
            FluTheme.isNativeText = !FluTheme.isNativeText
        }
    }
--- a/example/qml.qrc
+++ b/example/qml.qrc
@ -31,5 +31,6 @@
        <file>T_Expander.qml</file>
        <file>MainPage.qml</file>
        <file>T_TimePicker.qml</file>
+        <file>T_DatePicker.qml</file>
    </qresource>
 </RCC>
--- a/src/controls/FluAppBar.qml
+++ b/src/controls/FluAppBar.qml
@ -93,15 +93,15 @@ Rectangle{
                fontStyle: FluText.Body
            }
            FluToggleSwitch{
-                checked: FluTheme.isDark
-                onClickFunc:function(){
+                selected: FluTheme.isDark
+                clickFunc:function(){
                    FluTheme.isDark = !FluTheme.isDark
                }
            }
        }

        FluIconButton{
-            icon : FluentIcons.ChromeMinimizeContrast
+            iconSource : FluentIcons.ChromeMinimizeContrast
            Layout.alignment: Qt.AlignVCenter
            iconSize: 15
            text:"最小化"
@ -117,7 +117,7 @@ Rectangle{
                    return false
                return Window.Maximized === window.visibility
            }
-            icon : isRestore  ? FluentIcons.ChromeRestoreContrast : FluentIcons.ChromeMaximizeContrast
+            iconSource : isRestore  ? FluentIcons.ChromeRestoreContrast : FluentIcons.ChromeMaximizeContrast
            color:hovered ? "#20000000" : "#00000000"
            Layout.alignment: Qt.AlignVCenter
            visible: resizable
@ -129,7 +129,7 @@ Rectangle{
            }
        }
        FluIconButton{
-            icon : FluentIcons.ChromeCloseContrast
+            iconSource : FluentIcons.ChromeCloseContrast
            Layout.alignment: Qt.AlignVCenter
            text:"关闭"
            iconSize: 13
--- a/src/controls/FluAutoSuggestBox.qml
+++ b/src/controls/FluAutoSuggestBox.qml
@ -7,7 +7,7 @@ TextField{
    property var values:[]
    property int fontStyle: FluText.Body
    property int pixelSize : FluTheme.textSize
-    property int icon: -1
+    property int iconSource: -1
    signal itemClicked(string data)

    id:input
@ -29,6 +29,20 @@ TextField{
    }
    rightPadding: icon_right.visible ? 50 : 30
    selectByMouse: true
+
+    Keys.onUpPressed: {
+        list_view.currentIndex = Math.max(list_view.currentIndex-1,0)
+    }
+
+    Keys.onDownPressed: {
+        list_view.currentIndex = Math.min(list_view.currentIndex+1,list_view.count-1)
+    }
+
+    signal handleClicked
+    Keys.onEnterPressed:handleClicked()
+    Keys.onReturnPressed:handleClicked()
+
+
    font.bold: {
        switch (fontStyle) {
        case FluText.Display:
@ -77,7 +91,7 @@ TextField{
        inputItem: input

        FluIconButton{
-            icon:FluentIcons.ChromeClose
+            iconSource:FluentIcons.ChromeClose
            iconSize: 10
            width: 20
            height: 20
@ -95,10 +109,10 @@ TextField{

        FluIcon{
            id:icon_right
-            icon: input.icon
+            iconSource: input.iconSource
            iconSize: 15
            opacity: 0.5
-            visible: input.icon != -1
+            visible: input.iconSource != -1
            anchors{
                verticalCenter: parent.verticalCenter
                right: parent.right
@ -118,6 +132,11 @@ TextField{
        onClosed: {
            input.focus = false
        }
+        onVisibleChanged: {
+            if(visible){
+                list_view.currentIndex = -1
+            }
+        }
        background: Rectangle{
            width: input.width
            radius: 4
@ -132,6 +151,7 @@ TextField{
                anchors.fill: parent
                boundsBehavior: ListView.StopAtBounds
                clip: true
+                currentIndex: -1
                header: Item{
                    width: input.width
                    height: visible ? 38 : 0
@ -146,42 +166,81 @@ TextField{
                    }
                }
                ScrollBar.vertical: ScrollBar { }
-                delegate: Item{
-                    height: 38
+                delegate:Control{
                    width: input.width
-                    Rectangle{
-                        anchors.fill: parent
-                        anchors.topMargin: 2
-                        anchors.bottomMargin: 2
-                        anchors.leftMargin: 5
-                        anchors.rightMargin: 5
+                    padding:10
+                    background: Rectangle{
                        color:  {
-                            if(item_mouse.containsMouse){
+                            if(list_view.currentIndex === index){
+                                return FluTheme.isDark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
+                            }
+                            if(hovered){
                                return FluTheme.isDark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                            }
                            return FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                        }
-                        radius: 3
                        MouseArea{
-                            id:item_mouse
+                            id:mouse_area
                            anchors.fill: parent
-                            hoverEnabled: true
-                            onClicked: {
+                            Connections{
+                                target: input
+                                function onHandleClicked(){
+                                    if((list_view.currentIndex === index)){
+                                        mouse_area.handleClick()
+                                    }
+                                }
+                            }
+                            onClicked: handleClick()
+                            function handleClick(){
                                input_popup.close()
                                input.itemClicked(modelData)
                                input.text = modelData
                            }
                        }
-                        FluText{
-                            text:modelData
+                        Rectangle{
+                            width: 3
+                            color:FluTheme.primaryColor.dark
+                            visible: list_view.currentIndex === index
+                            radius: 3
+                            height: 20
                            anchors{
-                                verticalCenter: parent.verticalCenter
                                left: parent.left
-                                leftMargin: 10
+                                verticalCenter: parent.verticalCenter
                            }
                        }
                    }
+                    contentItem: FluText{
+                        text:modelData
+                        anchors{
+                            verticalCenter: parent.verticalCenter
+                        }
+                    }
+
                }
+                //                Item{
+                //                    height: 38
+                //                    width: input.width
+                //                    Rectangle{
+                //                        anchors.fill: parent
+                //                        anchors.topMargin: 2
+                //                        anchors.bottomMargin: 2
+                //                        anchors.leftMargin: 5
+                //                        anchors.rightMargin: 5
+
+                //                        radius: 3
+                //                        MouseArea{
+                //                            id:item_mouse
+                //                            anchors.fill: parent
+                //                            hoverEnabled: true
+                //                            onClicked: {
+                //                                input_popup.close()
+                //                                input.itemClicked(modelData)
+                //                                input.text = modelData
+                //                            }
+                //                        }
+
+                //                    }
+                //                }
            }
        }
    }
--- a/src/controls/FluButton.qml
+++ b/src/controls/FluButton.qml
@ -1,47 +1,44 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import FluentUI 1.0

-Rectangle {
-    id: button
+Button {

-    property string text: "Standard Button"
-    property int startPadding : 15
-    property int endPadding : 15
-    property int topPadding: 5
-    property int bottomPadding: 5
    property bool disabled: false
-    property color primaryColor : "#0064B0"
-    signal clicked
-    radius: 4
+    property color normalColor: FluTheme.isDark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
+    property color hoverColor: FluTheme.isDark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
+    property color disableColor: FluTheme.isDark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1)

-    color:{
-        if(FluTheme.isDark){
+    id: control
+    topPadding:5
+    bottomPadding:5
+    leftPadding:15
+    rightPadding:15
+    enabled: !disabled
+    focusPolicy:Qt.TabFocus
+
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+
+    background: Rectangle{
+        border.color: FluTheme.isDark ? "#505050" : "#DFDFDF"
+        border.width: 1
+        radius: 4
+        FluFocusRectangle{
+            visible: control.visualFocus
+            radius:8
+        }
+        color:{
            if(disabled){
-                return Qt.rgba(59/255,59/255,59/255,1)
+                return disableColor
            }
-            return  button_mouse.containsMouse ? "#444444" : "#3e3e3e"
-        }else{
-            if(disabled){
-                return Qt.rgba(252/255,252/255,252/255,1)
-            }
-            return  button_mouse.containsMouse ? "#FBFBFB" : "#FFFFFF"
+            return hovered ? hoverColor :normalColor
        }
    }
-    width: button_text.implicitWidth
-    height: button_text.implicitHeight
-
-    border.color: FluTheme.isDark ? "#505050" : "#DFDFDF"
-    border.width: 1
-
-
-    FluText {
-        id: button_text
-        text: button.text
-        leftPadding: button.startPadding
-        rightPadding: button.endPadding
-        topPadding: button.topPadding
-        bottomPadding: button.bottomPadding
+    contentItem: FluText {
+        text: control.text
        anchors.centerIn: parent
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
        color: {
            if(FluTheme.isDark){
                if(disabled){
@ -56,16 +53,4 @@ Rectangle {
            }
        }
    }
-
-    MouseArea {
-        id:button_mouse
-        anchors.fill: parent
-        hoverEnabled: true
-        onClicked: {
-            if(disabled){
-                return
-            }
-            button.clicked()
-        }
-    }
 }
--- a/src/controls/FluCheckBox.qml
+++ b/src/controls/FluCheckBox.qml
@ -1,35 +1,45 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0

-Item {
-
-    id:root
-    property bool checked: false
-    property string text: "Check Box"
-    property var checkClicked
-    property bool hovered: mouse_area.containsMouse
+Button {

+    property bool selected: false
+    property var clickFunc
    property bool disabled: false
-
-    width: childrenRect.width
-    height: childrenRect.height
-
    property color borderNormalColor: FluTheme.isDark ? Qt.rgba(160/255,160/255,160/255,1) : Qt.rgba(136/255,136/255,136/255,1)
-    property color borderCheckedColor: FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
+    property color borderSelectedColor: FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
    property color borderHoverColor: FluTheme.isDark ? Qt.rgba(167/255,167/255,167/255,1) : Qt.rgba(135/255,135/255,135/255,1)
    property color borderDisableColor: FluTheme.isDark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
-
    property color normalColor: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(247/255,247/255,247/255,1)
-    property color checkedColor: FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
+    property color selectedColor: FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
    property color hoverColor: FluTheme.isDark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(244/255,244/255,244/255,1)
-    property color checkedHoverColor: FluTheme.isDark ? Qt.darker(checkedColor,1.1) : Qt.lighter(checkedColor,1.1)
-
-    property color checkedDisableColor: FluTheme.isDark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
-
+    property color selectedHoverColor: FluTheme.isDark ? Qt.darker(selectedColor,1.1) : Qt.lighter(selectedColor,1.1)
+    property color selectedDisableColor: FluTheme.isDark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
    property color disableColor: FluTheme.isDark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)

-    RowLayout{
+    id:control
+    enabled: !disabled
+    focusPolicy:Qt.TabFocus
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+    padding:0
+    onClicked: {
+        if(disabled){
+            return
+        }
+        if(clickFunc){
+            clickFunc()
+            return
+        }
+        selected = !selected
+    }
+    background: Item{
+        FluFocusRectangle{
+            visible: control.visualFocus
+        }
+    }
+    contentItem: RowLayout{
        spacing: 4
        Rectangle{
            width: 20
@ -39,8 +49,8 @@ Item {
                if(disabled){
                    return borderDisableColor
                }
-                if(checked){
-                    return borderCheckedColor
+                if(selected){
+                    return borderSelectedColor
                }
                if(hovered){
                    return borderHoverColor
@ -49,47 +59,30 @@ Item {
            }
            border.width: 1
            color: {
-                if(checked){
+                if(selected){
                    if(disabled){
-                        return checkedDisableColor
+                        return selectedDisableColor
                    }
                    if(hovered){
-                        return checkedHoverColor
+                        return selectedHoverColor
                    }
-                    return checkedColor
+                    return selectedColor
                }
                if(hovered){
                    return hoverColor
                }
                return normalColor
            }
-
            FluIcon {
                anchors.centerIn: parent
-                icon: FluentIcons.AcceptMedium
+                iconSource: FluentIcons.AcceptMedium
                iconSize: 15
-                visible: checked
+                visible: selected
                color: FluTheme.isDark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
            }
        }
        FluText{
-            text:root.text
+            text:control.text
        }
    }
-
-
-    MouseArea{
-        id:mouse_area
-        anchors.fill: parent
-        hoverEnabled: true
-        enabled: !disabled
-        onClicked: {
-            if(checkClicked){
-                checkClicked()
-                return
-            }
-            checked = !checked
-        }
-    }
-
 }
--- a/src/controls/FluDatePicker.qml
+++ b/src/controls/FluDatePicker.qml
@ -1,5 +1,397 @@
-import QtQuick 2.15
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+Rectangle {
+
+    id:root
+
+    property color dividerColor: FluTheme.isDark ? Qt.rgba(77/255,77/255,77/255,1) : Qt.rgba(239/255,239/255,239/255,1)
+    property color hoverColor: FluTheme.isDark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
+    property color normalColor: FluTheme.isDark ? 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
+
+    color: {
+        if(mouse_area.containsMouse){
+            return hoverColor
+        }
+        return normalColor
+    }
+    height: 30
+    width: 300
+    radius: 4
+    border.width: 1
+    border.color: dividerColor
+
+    MouseArea{
+        id:mouse_area
+        hoverEnabled: true
+        anchors.fill: parent
+        onClicked: {
+            popup.showPopup()
+        }
+    }
+
+    Rectangle{
+        id:divider_1
+        width: 1
+        x:  parent.width/3
+        height: parent.height
+        color: dividerColor
+        visible: showYear
+    }
+
+
+    Rectangle{
+        id:divider_2
+        width: 1
+        x: showYear ? parent.width*2/3 :  parent.width/2
+        height: parent.height
+        color: dividerColor
+    }
+
+    FluText{
+        id:text_year
+        anchors{
+            left: parent.left
+            right: divider_1.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        visible: showYear
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"年"
+    }
+
+
+    FluText{
+        id:text_month
+        anchors{
+            left: showYear ? divider_1.right : parent.left
+            right: divider_2.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"月"
+    }
+
+
+    FluText{
+        id:text_day
+        anchors{
+            left: divider_2.right
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+        }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"日"
+    }
+
+    Popup{
+        id:popup
+        background: Rectangle{
+            width: 300
+            radius: 4
+            color: FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            height: 340
+            MouseArea{
+                anchors.fill: parent
+            }
+            FluShadow{
+                radius: 4
+            }
+
+            RowLayout{
+                id:layout_content
+                spacing: 0
+                width: parent.width
+                height: 300
+
+                Component{
+                    id:list_delegate
+
+                    Item{
+                        height:38
+                        width:getListView().width
+
+                        function getListView(){
+                            if(type === 0)
+                                return list_view_1
+                            if(type === 1)
+                                return list_view_2
+                            if(type === 2)
+                                return list_view_3
+                        }
+
+
+                        Rectangle{
+                            anchors.fill: parent
+                            anchors.topMargin: 2
+                            anchors.bottomMargin: 2
+                            anchors.leftMargin: 5
+                            anchors.rightMargin: 5
+                            color:  {
+                                if(getListView().currentIndex === position){
+                                    if(FluTheme.isDark){
+                                        return  item_mouse.containsMouse ? Qt.darker(FluTheme.primaryColor.lighter,1.1) : FluTheme.primaryColor.lighter
+                                    }else{
+                                        return  item_mouse.containsMouse ? Qt.lighter(FluTheme.primaryColor.dark,1.1): FluTheme.primaryColor.dark
+                                    }
+                                }
+                                if(item_mouse.containsMouse){
+                                    return FluTheme.isDark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
+                                }
+                                return FluTheme.isDark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                            }
+                            radius: 3
+                            MouseArea{
+                                id:item_mouse
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                onClicked: {
+                                    getListView().currentIndex = position
+                                    if(type === 0){
+                                        text_year.text = model
+                                        list_view_2.model = generateMonthArray(1,12)
+                                        text_month.text = list_view_2.model[list_view_2.currentIndex]
+
+                                        list_view_3.model = generateMonthDaysArray(list_view_1.model[list_view_1.currentIndex],list_view_2.model[list_view_2.currentIndex])
+                                        text_day.text = list_view_3.model[list_view_3.currentIndex]
+                                    }
+                                    if(type === 1){
+                                        text_month.text = model
+                                        list_view_3.model = generateMonthDaysArray(list_view_1.model[list_view_1.currentIndex],list_view_2.model[list_view_2.currentIndex])
+                                        text_day.text = list_view_3.model[list_view_3.currentIndex]
+
+                                    }
+                                    if(type === 2){
+                                        text_day.text = model
+                                    }
+                                }
+                            }
+                            FluText{
+                                text:model
+                                color: {
+                                    if(getListView().currentIndex === position){
+                                        if(FluTheme.isDark){
+                                            return Qt.rgba(0,0,0,1)
+                                        }else{
+                                            return Qt.rgba(1,1,1,1)
+                                        }
+                                    }else{
+                                        return FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+                                    }
+                                }
+                                anchors.centerIn: parent
+                            }
+                        }
+                    }
+                }
+
+                ListView{
+                    id:list_view_1
+                    width: 100
+                    height: parent.height
+                    boundsBehavior:Flickable.StopAtBounds
+                    ScrollBar.vertical: ScrollBar { }
+                    model: generateYearArray(1924,2048)
+                    clip: true
+                    visible: showYear
+                    delegate: Loader{
+                        property var model: modelData
+                        property int type:0
+                        property int position:index
+                        sourceComponent: list_delegate
+                    }
+                    onCurrentIndexChanged: {
+                        if(currentIndex!==-1){
+                            list_view_1.positionViewAtIndex(currentIndex, ListView.NoPosition)
+                        }
+                    }
+                }
+                Rectangle{
+                    width: 1
+                    height: parent.height
+                    color: dividerColor
+                }
+                ListView{
+                    id:list_view_2
+                    width: showYear ? 100 : 150
+                    height: parent.height
+                    clip: true
+                    ScrollBar.vertical: ScrollBar { }
+                    boundsBehavior:Flickable.StopAtBounds
+                    delegate: Loader{
+                        property var model: modelData
+                        property int type:1
+                        property int position:index
+                        sourceComponent: list_delegate
+                    }
+                    onCurrentIndexChanged: {
+                        if(currentIndex!==-1){
+                            list_view_2.positionViewAtIndex(currentIndex, ListView.NoPosition)
+                        }
+                    }
+                }
+                Rectangle{
+                    width: 1
+                    height: parent.height
+                    color: dividerColor
+                }
+                ListView{
+                    id:list_view_3
+                    width:  showYear ? 100 : 150
+                    height: parent.height
+                    clip: true
+                    ScrollBar.vertical: ScrollBar { }
+                    Layout.alignment: Qt.AlignVCenter
+                    boundsBehavior:Flickable.StopAtBounds
+                    delegate: Loader{
+                        property var model: modelData
+                        property int type:2
+                        property int position:index
+                        sourceComponent: list_delegate
+                    }
+                    onCurrentIndexChanged: {
+                        list_view_3.positionViewAtIndex(currentIndex, ListView.NoPosition)
+                    }
+                }
+            }
+
+            Rectangle{
+                width: parent.width
+                height: 1
+                anchors.top: layout_content.bottom
+                color: dividerColor
+            }
+
+            Rectangle{
+                id:layout_actions
+                height: 40
+                radius: 5
+                color: FluTheme.isDark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
+                anchors{
+                    bottom:parent.bottom
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Item {
+                    id:divider
+                    width: 1
+                    height: parent.height
+                    anchors.centerIn: parent
+                }
+
+                FluButton{
+                    anchors{
+                        left: parent.left
+                        leftMargin: 20
+                        rightMargin: 10
+                        right: divider.left
+                        verticalCenter: parent.verticalCenter
+                    }
+                    text: "取消"
+                    onClicked: {
+                        popup.close()
+                    }
+                }
+
+                FluFilledButton{
+                    anchors{
+                        right: parent.right
+                        left: divider.right
+                        rightMargin: 20
+                        leftMargin: 10
+                        verticalCenter: parent.verticalCenter
+                    }
+                    text: "确定"
+                    onClicked: {
+                        changeFlag = false
+                        popup.close()
+                    }
+                }
+
+            }
+
+        }
+        y:35
+        function showPopup() {
+            changeFlag = true
+            rowData[0] = text_year.text
+            rowData[1] = text_month.text
+            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);
+            var day =  text_day.text === "日" ? now.getDate() : Number(text_day.text);
+
+            list_view_1.currentIndex = list_view_1.model.indexOf(year)
+            text_year.text = year
+
+            list_view_2.model = generateMonthArray(1,12)
+            list_view_2.currentIndex = list_view_2.model.indexOf(month)
+            text_month.text = month
+
+            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)
+            if(window.height>pos.y+35+340){
+                popup.y = 35
+            }else{
+                popup.y = window.height-(pos.y+340)
+            }
+            popup.open()
+        }
+
+        onClosed: {
+            if(changeFlag){
+                text_year.text = rowData[0]
+                text_month.text = rowData[1]
+                text_day.text = rowData[2]
+            }
+        }
+    }
+
+    property bool changeFlag: true
+    readonly property var rowData: ["","",""]
+
+    function generateYearArray(startYear, endYear) {
+        const yearArray = [];
+        for (let year = startYear; year <= endYear; year++) {
+            yearArray.push(year);
+        }
+        return yearArray;
+    }
+
+    function generateMonthArray(startMonth, endMonth) {
+        const monthArray = [];
+        for (let month = startMonth; month <= endMonth; month++) {
+            monthArray.push(month);
+        }
+        return monthArray;
+    }
+
+    function generateMonthDaysArray(year, month) {
+        const monthDaysArray = [];
+        const lastDayOfMonth = new Date(year, month, 0).getDate();
+        for (let day = 1; day <= lastDayOfMonth; day++) {
+            monthDaysArray.push(day);
+        }
+        return monthDaysArray;
+    }

-Item {

 }
--- a/src/controls/FluExpander.qml
+++ b/src/controls/FluExpander.qml
@ -49,11 +49,14 @@ Item {
                right: parent.right
                rightMargin: 15
            }
-            hoverColor: FluTheme.isDark ? Qt.rgba(73/255,73/255,73/255,1) : Qt.rgba(245/255,245/255,245/255,1)
-            normalColor: FluTheme.isDark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
-            hovered: root_mouse.containsMouse
+            color:{
+                if(root_mouse.containsMouse){
+                    return FluTheme.isDark ? Qt.rgba(73/255,73/255,73/255,1) : Qt.rgba(245/255,245/255,245/255,1)
+                }
+                return FluTheme.isDark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
+            }
            iconSize: 15
-            icon: expand ? FluentIcons.ChevronUp : FluentIcons.ChevronDown
+            iconSource: expand ? FluentIcons.ChevronUp : FluentIcons.ChevronDown
            onClicked: {
                expand = !expand
            }
--- a/src/controls/FluFilledButton.qml
+++ b/src/controls/FluFilledButton.qml
@ -2,37 +2,38 @@
 import QtQuick.Controls 2.15
 import FluentUI 1.0

-Rectangle {
-    id: button
+Button {
+    id: control

-    property string text: "Filled Button"
-    property int startPadding : 15
-    property int endPadding : 15
-    property int topPadding: 5
-    property int bottomPadding: 5
    property bool disabled: false
+    property color normalColor: FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
+    property color hoverColor: FluTheme.isDark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
+    property color disableColor: FluTheme.isDark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)

-    signal clicked
-    radius: 4
-    color:{
-        if(FluTheme.isDark){
+    enabled: !disabled
+    topPadding:5
+    bottomPadding:5
+    leftPadding:15
+    rightPadding:15
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+    focusPolicy:Qt.TabFocus
+    background: Rectangle{
+        radius: 4
+        FluFocusRectangle{
+            visible: control.visualFocus
+            radius:8
+        }
+        color:{
            if(disabled){
-                return Qt.rgba(199/255,199/255,199/255,1)
+                return disableColor
            }
-            return  button_mouse.containsMouse ? Qt.darker(FluTheme.primaryColor.lighter,1.1) : FluTheme.primaryColor.lighter
-        }else{
-            if(disabled){
-                return Qt.rgba(199/255,199/255,199/255,1)
-            }
-            return  button_mouse.containsMouse ? Qt.lighter(FluTheme.primaryColor.dark,1.1): FluTheme.primaryColor.dark
+            return hovered ? hoverColor :normalColor
        }
    }
-    width: button_text.implicitWidth
-    height: button_text.implicitHeight
-
-    FluText {
-        id: button_text
-        text: button.text
+    contentItem: FluText {
+        text: control.text
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
        color: {
            if(FluTheme.isDark){
                if(disabled){
@ -44,21 +45,5 @@ Rectangle {
            }
        }
        font.pixelSize: 14
-        leftPadding: button.startPadding
-        rightPadding: button.endPadding
-        topPadding: button.topPadding
-        bottomPadding: button.bottomPadding
-        anchors.centerIn: parent
-    }
-
-    MouseArea {
-        id:button_mouse
-        anchors.fill: parent
-        hoverEnabled: true
-        onClicked: {
-            if(disabled)
-                return
-            button.clicked()
-        }
    }
 }
--- a/src/controls/FluFocusRectangle.qml
+++ b/src/controls/FluFocusRectangle.qml
@ -0,0 +1,22 @@
+import QtQuick 2.15
+import FluentUI 1.0
+
+Item {
+    id:root
+    anchors.fill: parent
+    anchors.margins: -3
+
+    property var radius: 4
+
+    Rectangle{
+        width: root.width
+        height: root.height
+        anchors.centerIn: parent
+        color: "#00000000"
+        border.width: 3
+        radius: root.radius
+        border.color: FluTheme.isDark ? Qt.rgba(1,1,1,1) : Qt.rgba(0,0,0,1)
+        z: 65535
+    }
+
+}
--- a/src/controls/FluIcon.qml
+++ b/src/controls/FluIcon.qml
@ -2,7 +2,7 @@

 Text {

-    property int icon
+    property int iconSource
    property int iconSize: 20
    property color iconColor: FluTheme.isDark ? "#FFFFFF" : "#000000"

@ -12,5 +12,5 @@ Text {
    horizontalAlignment: Text.AlignHCenter
    verticalAlignment: Text.AlignVCenter
    color: iconColor
-    text: (String.fromCharCode(icon).toString(16));
+    text: (String.fromCharCode(iconSource).toString(16));
 }
--- a/src/controls/FluIconButton.qml
+++ b/src/controls/FluIconButton.qml
@ -1,23 +1,21 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
 import FluentUI 1.0

-Rectangle {
-
-    id:button
-    width: 30
-    height: 30
+Button {

    property int iconSize: 20
-    property int icon
-    property alias text: tool_tip.text
-    signal clicked
+    property int iconSource
    property bool disabled: false
-    property bool hovered: button_mouse.containsMouse
-
    property color hoverColor: FluTheme.isDark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(0,0,0,0.03)
    property color normalColor: FluTheme.isDark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
    property color disableColor: FluTheme.isDark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(0,0,0,0)
-
+    property color color: {
+        if(disabled){
+            return disableColor
+        }
+        return hovered ? hoverColor : normalColor
+    }
    property color textColor: {
        if(FluTheme.isDark){
            if(disabled){
@ -31,47 +29,46 @@ Rectangle {
            return Qt.rgba(0,0,0,1)
        }
    }
-    radius: 4

-    color: {
-        if(disabled){
-            return disableColor
+    id:control
+    width: 30
+    height: 30
+    implicitWidth: width
+    implicitHeight: height
+    padding: 0
+    enabled: !disabled
+    focusPolicy:Qt.TabFocus
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+    background: Rectangle{
+        radius: 4
+        color:control.color
+        FluFocusRectangle{
+            visible: control.visualFocus
        }
-        return (hovered || button_mouse.containsMouse) ? hoverColor : normalColor
    }
-
-    Text {
-        id:text_icon
-        font.family: "Segoe Fluent Icons"
-        font.pixelSize: iconSize
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        anchors.centerIn: parent
-        color:button.textColor
-        text: (String.fromCharCode(icon).toString(16));
-    }
-
-    MouseArea{
-        id:button_mouse
-        anchors.fill: parent
-        hoverEnabled: true
-        onClicked: {
-            if(disabled){
-                return
+    contentItem: Item{
+        Text {
+            id:text_icon
+            font.family: "Segoe Fluent Icons"
+            font.pixelSize: iconSize
+            width: iconSize
+            height: iconSize
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            anchors.centerIn: parent
+            color:control.textColor
+            text: (String.fromCharCode(iconSource).toString(16));
+        }
+        FluTooltip{
+            id:tool_tip
+            visible: {
+                if(control.text === ""){
+                    return false
+                }
+                return hovered
            }
-            button.clicked()
+            text:control.text
+            delay: 1000
        }
    }
-
-    FluTooltip{
-        id:tool_tip
-        visible: {
-            if(button.text === ""){
-                return false
-            }
-            return (hovered || button_mouse.containsMouse)
-        }
-        delay: 1000
-    }
-
 }
--- a/src/controls/FluInfoBar.qml
+++ b/src/controls/FluInfoBar.qml
@ -190,7 +190,7 @@ FluObject {
                spacing: 10

                FluIcon{
-                    icon:{
+                    iconSource:{
                        switch(_super.type){
                        case mcontrol.const_success: return FluentIcons.CompletedSolid;
                        case mcontrol.const_warning: return FluentIcons.InfoSolid;
--- a/src/controls/FluNavigationView.qml
+++ b/src/controls/FluNavigationView.qml
@ -145,7 +145,7 @@ Item {
            height:parent.height
            spacing: 0
            FluIconButton{
-                icon: FluentIcons.ChromeBack
+                iconSource: FluentIcons.ChromeBack
                Layout.leftMargin: 5
                Layout.alignment: Qt.AlignVCenter
                disabled:  nav_swipe.depth === 1
@ -160,7 +160,7 @@ Item {
                }
            }
            FluIconButton{
-                icon: FluentIcons.GlobalNavButton
+                iconSource: FluentIcons.GlobalNavButton
                Layout.leftMargin: 5
                iconSize: 15
                visible: displayMode === FluNavigationView.Minimal
@ -184,8 +184,8 @@ Item {
                fontStyle: FluText.Body
            }
            FluToggleSwitch{
-                checked: FluTheme.isDark
-                onClickFunc:function(){
+                selected: FluTheme.isDark
+                clickFunc:function(){
                    FluTheme.isDark = !FluTheme.isDark
                }
            }
@ -195,7 +195,7 @@ Item {
    Item{
        anchors{
            left: displayMode === FluNavigationView.Minimal ? parent.left : layout_list.right
-            leftMargin: 2
+            leftMargin: 10
            top: nav_app_bar.bottom
            right: parent.right
            rightMargin: 10
@ -207,7 +207,6 @@ Item {
            id:nav_swipe
            anchors.fill: parent
            clip: true
-            anchors.margins: 10
            popEnter : Transition{}
            popExit : Transition {
                NumberAnimation { properties: "y"; from: 0; to: nav_swipe.height; duration: 200 }
@ -270,7 +269,7 @@ Item {
            FluAutoSuggestBox{
                width: 280
                anchors.centerIn: parent
-                icon: FluentIcons.Zoom
+                iconSource: FluentIcons.Zoom
                values: {
                    var arr = []
                    if(items==null)
--- a/src/controls/FluRadioButton.qml
+++ b/src/controls/FluRadioButton.qml
@ -1,19 +1,25 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0


-Item {
+Button {

-    id:root
-    width: childrenRect.width
-    height: childrenRect.height
-    property bool checked: false
-    property string text: "RodioButton"
-    signal clicked
+    property bool selected: false
    property bool disabled: false

-    RowLayout{
+    id:control
+    enabled: !disabled
+    focusPolicy:Qt.TabFocus
+    padding:0
+    background: Item{
+        FluFocusRectangle{
+            visible: control.visualFocus
+        }
+    }
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+    contentItem: RowLayout{
        Rectangle{
            id:rect_check
            width: 20
@ -23,22 +29,22 @@ Item {
            layer.enabled: true
            layer.smooth: true
            border.width: {
-                if(checked&&disabled){
+                if(selected&&disabled){
                    return 3
                }
-                if(root_mouse.containsPress){
-                    if(checked){
+                if(hovered){
+                    if(selected){
                        return 5
                    }
                    return 1
                }
-                if(root_mouse.containsMouse){
-                    if(checked){
+                if(hovered){
+                    if(selected){
                        return 3
                    }
                    return 1
                }
-                return checked ? 5 : 1
+                return selected ? 5 : 1
            }
            Behavior on border.width {
                NumberAnimation{
@ -53,7 +59,7 @@ Item {
                        return Qt.rgba(198/255,198/255,198/255,1)
                    }
                }
-                if(checked){
+                if(selected){
                    if(FluTheme.isDark){
                        return FluTheme.primaryColor.lighter
                    }else{
@ -70,17 +76,17 @@ Item {
                }
            }
            color:{
-                if(disabled&&checked){
+                if(disabled&&selected){
                    return Qt.rgba(159/255,159/255,159/255,1)
                }
                if(FluTheme.isDark){
-                    if(root_mouse.containsMouse){
+                    if(hovered){
                        return Qt.rgba(43/255,43/255,43/255,1)
                    }
                    return Qt.rgba(50/255,50/255,50/255,1)
                }else{
-                    if(root_mouse.containsMouse){
-                        if(checked){
+                    if(hovered){
+                        if(selected){
                            return Qt.rgba(1,1,1,1)
                        }
                        return Qt.rgba(222/255,222/255,222/255,1)
@ -89,23 +95,10 @@ Item {
                }
            }
        }
-
        FluText{
-            text: root.text
+            text: control.text
            Layout.alignment: Qt.AlignVCenter
        }
-
    }
-
-    MouseArea{
-        id:root_mouse
-        hoverEnabled: true
-        anchors.fill: parent
-        enabled: !disabled
-        onClicked: {
-            root.clicked()
-        }
-    }
-
 }

--- a/src/controls/FluTimePicker.qml
+++ b/src/controls/FluTimePicker.qml
@ -100,7 +100,7 @@ Rectangle {
        }
        verticalAlignment: Text.AlignVCenter
        horizontalAlignment: Text.AlignHCenter
-        text:"上午"
+        text:"AM/PM"
    }

    Popup{
@ -210,6 +210,9 @@ Rectangle {
                        property int position:index
                        sourceComponent: list_delegate
                    }
+                    onCurrentIndexChanged: {
+                        list_view_1.positionViewAtIndex(currentIndex, ListView.NoPosition)
+                    }
                }
                Rectangle{
                    width: 1
@ -230,12 +233,15 @@ Rectangle {
                        property int position:index
                        sourceComponent: list_delegate
                    }
+                    onCurrentIndexChanged: {
+                        list_view_2.positionViewAtIndex(currentIndex, ListView.NoPosition)
+                    }
                }
                Rectangle{
                    width: 1
                    height: parent.height
                    color: dividerColor
-                     visible: isH
+                    visible: isH
                }
                ListView{
                    id:list_view_3
@ -253,6 +259,9 @@ Rectangle {
                        property int position:index
                        sourceComponent: list_delegate
                    }
+                    onCurrentIndexChanged: {
+                        list_view_3.positionViewAtIndex(currentIndex, ListView.NoPosition)
+                    }
                }
            }

@ -319,9 +328,35 @@ Rectangle {
            rowData[0] = text_hour.text
            rowData[1] = text_minute.text
            rowData[2] = text_ampm.text
-            list_view_1.currentIndex = -1
-            list_view_2.currentIndex = -1
-            list_view_3.currentIndex = -1
+
+            var now = new Date();
+
+            var hour
+            var ampm;
+            if(isH){
+                hour  = now.getHours();
+                if(hour>12){
+                    ampm = "下午"
+                    hour = hour-12
+                }else{
+                    ampm = "上午"
+                }
+            }else{
+                hour = now.getHours();
+            }
+            hour = text_hour.text === "时"? hour.toString().padStart(2, '0') : text_hour.text
+            var minute = text_minute.text === "分"? now.getMinutes().toString().padStart(2, '0') : text_minute.text
+            ampm = text_ampm.text === "AM/PM"?ampm:text_ampm.text
+            list_view_1.currentIndex = list_view_1.model.indexOf(hour);
+            list_view_2.currentIndex = list_view_2.model.indexOf(minute);
+            list_view_3.currentIndex = list_view_3.model.indexOf(ampm);
+
+            text_hour.text = hour
+            text_minute.text = minute
+            if(isH){
+                text_ampm.text = ampm
+            }
+
            var pos = root.mapToItem(null, 0, 0)
            if(window.height>pos.y+35+340){
                popup.y = 35
--- a/src/controls/FluToggleSwitch.qml
+++ b/src/controls/FluToggleSwitch.qml
@ -2,64 +2,66 @@
 import QtQuick.Controls 2.0
 import FluentUI 1.0

-Switch {
-    id: root
-    property var onClickFunc
+Button {
+
+    property bool selected: false
+    property var clickFunc
+
+    id: control
    width: 40
    implicitWidth: 40
    height: 20
    implicitHeight: 20
-    checkable: false
-    indicator: Rectangle {
-        width: root.width
-        height: root.height
+    focusPolicy:Qt.TabFocus
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+    onClicked: {
+        if(clickFunc){
+            clickFunc()
+            return
+        }
+        selected = !selected
+    }
+    background : Rectangle {
+        width: control.width
+        height: control.height
        radius: height / 2
+        FluFocusRectangle{
+            visible: control.visualFocus
+            radius: 20
+        }
        color: {
            if(FluTheme.isDark){
-                if(root.checked){
+                if(selected){
                    return FluTheme.primaryColor.dark
                }
-                if(switch_mouse.containsMouse){
+                if(hovered){
                    return "#3E3E3C"
                }
                return "#323232"
            }else{
-                if(root.checked){
+                if(selected){
                    return FluTheme.primaryColor.dark
                }
-                if(switch_mouse.containsMouse){
+                if(hovered){
                    return "#F4F4F4"
                }
                return  "#FFFFFF"
            }
        }
        border.width: 1
-        border.color: root.checked ? Qt.lighter(FluTheme.primaryColor.dark,1.2) : "#666666"
-
+        border.color: selected ? Qt.lighter(FluTheme.primaryColor.dark,1.2) : "#666666"
        Rectangle {
-            x:  root.checked ? root.implicitWidth  - width - 4 : 4
-            width:  root.height - 8
-            height: root.height - 8
+            x:  selected ? control.implicitWidth  - width - 4 : 4
+            width:  control.height - 8
+            height: control.height - 8
            radius: width / 2
-            scale: switch_mouse.containsMouse ? 1.2 : 1.0
+            scale: hovered ? 1.2 : 1.0
            anchors.verticalCenter: parent.verticalCenter
-            color: root.checked ? "#FFFFFF" : "#666666"
-//            border.color: "#D5D5D5"
+            color: selected ? "#FFFFFF" : "#666666"
            Behavior on x {
                NumberAnimation { duration: 200 }
            }
        }
    }
-    MouseArea{
-        id:switch_mouse
-        anchors.fill: parent
-        hoverEnabled: true
-        onClicked: {
-            if(root.onClickFunc){
-                root.onClickFunc()
-            }else{
-                root.checked = !root.checked
-            }
-        }
-    }
+
 }
--- a/src/controls/FluTreeView.qml
+++ b/src/controls/FluTreeView.qml
@ -163,7 +163,7 @@ Item {
                    FluCheckBox{
                        id:item_layout_checkbox
                        text:""
-                        checked: itemModel.multipSelected
+                        selected: itemModel.multipSelected
                        visible: selectionMode === FluTreeView.Multiple
                        Layout.leftMargin: 5

@ -199,7 +199,7 @@ Item {
                            }
                        }

-                        checkClicked:function(){
+                        clickFunc:function(){
                            if(hasChild){
                                const stack = [itemModel];
                                while (stack.length > 0) {
@ -222,7 +222,7 @@ Item {
                    FluIconButton{
                        id:item_layout_expanded
                        color:"#00000000"
-                        icon:item_layout.expanded?FluentIcons.ChevronDown:FluentIcons.ChevronRight
+                        iconSource:item_layout.expanded?FluentIcons.ChevronDown:FluentIcons.ChevronRight
                        opacity: item_layout.hasChild
                        iconSize: 15
                        onClicked: {
--- a/src/res.qrc
+++ b/src/res.qrc
@ -46,5 +46,6 @@
        <file>controls/FluDatePicker.qml</file>
        <file>controls/FluCalenderView.qml</file>
        <file>controls/FluCalendarDatePicker.qml</file>
+        <file>controls/FluFocusRectangle.qml</file>
    </qresource>
 </RCC>
Author	SHA1	Message	Date
$朱子楚\zhuzi$ 朱子楚\zhuzi	2b9e9b2159	update	2023-03-12 22:43:13 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	23bc5cdf68	update	2023-03-12 22:36:31 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	f75da5e3ce	update	2023-03-12 22:02:12 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	8cc828a56b	update	2023-03-12 21:49:11 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	f36914fdee	update	2023-03-12 14:27:46 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	0cf3f2aa22	update	2023-03-12 14:26:03 +08:00