update

2024-11-22 10:40:10 +08:00 · 2024-04-19 01:04:13 +08:00 · 2024-04-19 00:42:35 +08:00
17 changed files with 1865 additions and 1855 deletions
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@ -1089,46 +1089,6 @@ Updated content:
        <source>Click to Select a Color - &gt;</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="22"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="23"/>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="24"/>
-        <source>Color Picker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="25"/>
-        <source>Edit Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="26"/>
-        <source>Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="27"/>
-        <source>Green</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="28"/>
-        <source>Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="29"/>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>T_ComboBox</name>
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@ -1113,44 +1113,36 @@ Updated content:
        <translation type="unfinished">点击选中颜色 - &gt;</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="22"/>
        <source>Cancel</source>
-        <translation type="unfinished">取消</translation>
+        <translation type="obsolete">取消</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="23"/>
        <source>OK</source>
-        <translation type="unfinished">确定</translation>
+        <translation type="obsolete">确定</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="24"/>
        <source>Color Picker</source>
-        <translation type="unfinished">颜色选择器</translation>
+        <translation type="obsolete">颜色选择器</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="25"/>
        <source>Edit Color</source>
-        <translation type="unfinished">编辑颜色</translation>
+        <translation type="obsolete">编辑颜色</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="26"/>
        <source>Red</source>
-        <translation type="unfinished">红色</translation>
+        <translation type="obsolete">红色</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="27"/>
        <source>Green</source>
-        <translation type="unfinished">绿色</translation>
+        <translation type="obsolete">绿色</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="28"/>
        <source>Blue</source>
-        <translation type="unfinished">蓝色</translation>
+        <translation type="obsolete">蓝色</translation>
    </message>
    <message>
-        <location filename="qml/page/T_ColorPicker.qml" line="29"/>
        <source>Opacity</source>
-        <translation type="unfinished">透明度</translation>
+        <translation type="obsolete">透明度</translation>
    </message>
 </context>
 <context>
--- a/example/qml/page/T_ColorPicker.qml
+++ b/example/qml/page/T_ColorPicker.qml
@ -18,16 +18,7 @@ FluScrollablePage{
                text: qsTr("Click to Select a Color - >")
                Layout.alignment: Qt.AlignVCenter
            }
-            FluColorPicker{
-                cancelText: qsTr("Cancel")
-                okText: qsTr("OK")
-                titleText: qsTr("Color Picker")
-                editText: qsTr("Edit Color")
-                redText: qsTr("Red")
-                greenText: qsTr("Green")
-                blueText: qsTr("Blue")
-                opacityText: qsTr("Opacity")
-            }
+            FluColorPicker{}
        }
    }
    CodeExpander{
--- a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
@ -53,8 +53,6 @@ FluButton {
    }
    Menu{
        id:popup
-        height: container.height
-        width: container.width
        modal: true
        Overlay.modal: Item {}
        enter: Transition {
@ -75,13 +73,9 @@ FluButton {
            }
        }
        contentItem: Item{
-            clip: true
-            Rectangle{
            id:container
-                width: 300
-                height: 360
-                radius: 4
-                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            implicitWidth: 300
+            implicitHeight: 360
            ColumnLayout  {
                anchors.fill: parent
                spacing: 0
@ -611,22 +605,23 @@ FluButton {
                }
            }
        }
-        }
-        background: Item{
+        background:Rectangle{
+            radius: 5
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
-                radius: 4
+                radius: 5
            }
        }
        function showPopup() {
            var pos = control.mapToItem(null, 0, 0)
            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height
+                popup.y = control.height - 1
            } else if(pos.y>container.height){
                popup.y = -container.height
            } else {
                popup.y = d.window.height-(pos.y+container.height)
            }
-            popup.x = -(popup.width-control.width)/2
            popup.open()
        }
    }
--- a/src/Qt5/imports/FluentUI/Controls/FluColorPicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluColorPicker.qml
@ -13,16 +13,15 @@ Button{
    property color current : Qt.rgba(1,1,1,1)
    signal accepted()
    property int colorHandleRadius: 8
-    property string cancelText: "取消"
-    property string okText: "确定"
-    property string titleText: "颜色选择器"
-    property string editText: "编辑颜色"
-    property string redText: "红色"
-    property string greenText: "绿色"
-    property string blueText: "蓝色"
-    property string opacityText: "透明度"
-    background:
-        Rectangle{
+    property string cancelText: qsTr("Cancel")
+    property string okText: qsTr("OK")
+    property string titleText: qsTr("Color Picker")
+    property string editText: qsTr("Edit Color")
+    property string redText: qsTr("Red")
+    property string greenText: qsTr("Green")
+    property string blueText: qsTr("Blue")
+    property string opacityText: qsTr("Opacity")
+    background: Rectangle{
        id:layout_color
        radius: 5
        color:"#00000000"
--- a/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluComboBox.qml
@ -134,10 +134,9 @@ T.ComboBox {
            }
        }
        background:Rectangle{
-            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
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
                radius: 5
            }
--- a/src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml
@ -4,7 +4,6 @@ import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import FluentUI 1.0

-
 FluButton {
    property bool showYear: true
    property var current
@ -96,8 +95,6 @@ FluButton {
    Menu{
        id:popup
        modal: true
-        width: container.width
-        height: container.height
        Overlay.modal: Item {}
        enter: Transition {
            reversible: true
@ -116,35 +113,31 @@ FluButton {
                duration: FluTheme.animationEnabled ? 83 : 0
            }
        }
-        background:Item{
+        background:Rectangle{
+            radius: 5
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
-                radius: 4
+                radius: 5
            }
        }
        contentItem: Item{
-            clip: true
-            Rectangle{
            id:container
-                radius: 4
-                width: 300
-                height: 340
-                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            implicitHeight: 340
+            implicitWidth: 300
            MouseArea{
                anchors.fill: parent
            }
-                FluShadow{
-                    radius: 4
-                }
            RowLayout{
                id:layout_content
                spacing: 0
                width: parent.width
-                    height: 300
+                height: 280
                Component{
                    id:list_delegate
                    Item{
-                            height:38
-                            width:getListView().width
+                        height: 38
+                        width: getListView().width
                        function getListView(){
                            if(type === 0)
                                return list_view_1
@ -166,7 +159,7 @@ FluButton {
                                if(item_mouse.containsMouse){
                                    return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                                }
-                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                                return Qt.rgba(0,0,0,0)
                            }
                            radius: 3
                            MouseArea{
@ -214,8 +207,9 @@ FluButton {
                }
                ListView{
                    id:list_view_1
-                        width: 100
-                        height: parent.height
+                    Layout.preferredWidth: 100
+                    Layout.preferredHeight: parent.height - 2
+                    Layout.alignment: Qt.AlignVCenter
                    boundsBehavior:Flickable.StopAtBounds
                    ScrollBar.vertical: FluScrollBar {}
                    model: generateYearArray(1924,2048)
@ -232,14 +226,16 @@ FluButton {
                    }
                }
                Rectangle{
-                        width: 1
-                        height: parent.height
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: parent.height
                    color: control.dividerColor
+                    visible: showYear
                }
                ListView{
                    id:list_view_2
-                        width: showYear ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: showYear ? 99 : 150
+                    Layout.preferredHeight: parent.height - 2
+                    Layout.alignment: Qt.AlignVCenter
                    clip: true
                    ScrollBar.vertical: FluScrollBar {}
                    preferredHighlightBegin: 0
@ -254,20 +250,20 @@ FluButton {
                    }
                }
                Rectangle{
-                        width: 1
-                        height: parent.height
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: parent.height
                    color: control.dividerColor
                }
                ListView{
                    id:list_view_3
-                        width:  showYear ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: showYear ? 99 : 150
+                    Layout.preferredHeight: parent.height - 2
+                    Layout.alignment: Qt.AlignVCenter
                    clip: true
                    preferredHighlightBegin: 0
                    preferredHighlightEnd: 0
                    highlightMoveDuration: 0
                    ScrollBar.vertical: FluScrollBar {}
-                        Layout.alignment: Qt.AlignVCenter
                    boundsBehavior:Flickable.StopAtBounds
                    delegate: FluLoader{
                        property var model: modelData
@ -277,17 +273,12 @@ FluButton {
                    }
                }
            }
-                Rectangle{
-                    width: parent.width
-                    height: 1
-                    anchors.top: layout_content.bottom
-                    color: control.dividerColor
-                }
            Rectangle{
                id:layout_actions
-                    height: 40
-                    radius: 5
+                height: 60
                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
+                border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
+                radius: 5
                anchors{
                    bottom:parent.bottom
                    left: parent.left
@ -340,7 +331,6 @@ FluButton {
                }
            }
        }
-        }
        y:35
        function showPopup() {
            d.changeFlag = true
@ -361,7 +351,7 @@ FluButton {
            text_day.text = day
            var pos = control.mapToItem(null, 0, 0)
            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height
+                popup.y = control.height-1
            } else if(pos.y>container.height){
                popup.y = -container.height
            } else {
--- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
@ -778,9 +778,9 @@ Rectangle {
            timer_vertical_force_layout.restart()
        }
        Connections{
-            target: table_model
-            function onRowCountChanged(){
-                header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1}))
+            target: table_view
+            function onRowsChanged(){
+                header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1}))
            }
        }
        Timer{
--- a/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml
@ -111,8 +111,6 @@ FluButton {
    }
    Menu{
        id:popup
-        width: container.width
-        height: container.height
        modal: true
        Overlay.modal: Item {}
        enter: Transition {
@ -132,19 +130,18 @@ FluButton {
                duration: FluTheme.animationEnabled ? 83 : 0
            }
        }
-        background:Item{
+        background:Rectangle{
+            radius: 5
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
-                radius: 4
+                radius: 5
            }
        }
        contentItem: Item{
-            clip: true
-            Rectangle{
            id:container
-                height: 340
-                width: 300
-                radius: 4
-                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            implicitHeight: 340
+            implicitWidth: 300
            MouseArea{
                anchors.fill: parent
            }
@ -152,7 +149,7 @@ FluButton {
                id:layout_content
                spacing: 0
                width: parent.width
-                    height: 300
+                height: 280
                Component{
                    id:list_delegate
                    Item{
@ -179,7 +176,7 @@ FluButton {
                                if(item_mouse.containsMouse){
                                    return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                                }
-                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                                return Qt.rgba(0,0,0,0)
                            }
                            radius: 3
                            MouseArea{
@ -219,8 +216,9 @@ FluButton {
                }
                ListView{
                    id:list_view_1
-                        width: isH ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: isH ? 100 : 150
+                    Layout.preferredHeight: parent.height-2
+                    Layout.alignment: Qt.AlignVCenter
                    boundsBehavior:Flickable.StopAtBounds
                    ScrollBar.vertical: FluScrollBar {}
                    preferredHighlightBegin: 0
@ -236,14 +234,15 @@ FluButton {
                    }
                }
                Rectangle{
-                        width: 1
-                        height: parent.height
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: parent.height
                    color: control.dividerColor
                }
                ListView{
                    id:list_view_2
-                        width:  isH ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: isH ? 99 : 150
+                    Layout.preferredHeight: parent.height-2
+                    Layout.alignment: Qt.AlignVCenter
                    model: generateArray(0,59)
                    clip: true
                    preferredHighlightBegin: 0
@ -266,8 +265,8 @@ FluButton {
                }
                ListView{
                    id:list_view_3
-                        width: 100
-                        height: 76
+                    Layout.preferredWidth: 100
+                    Layout.preferredHeight: 76
                    model: [control.amText,control.pmText]
                    clip: true
                    visible: isH
@ -285,17 +284,12 @@ FluButton {
                    }
                }
            }
-                Rectangle{
-                    width: parent.width
-                    height: 1
-                    anchors.top: layout_content.bottom
-                    color: control.dividerColor
-                }
            Rectangle{
                id:layout_actions
-                    height: 40
-                    radius: 5
+                height: 60
                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
+                border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
+                radius: 5
                anchors{
                    bottom:parent.bottom
                    left: parent.left
@ -353,7 +347,6 @@ FluButton {
                }
            }
        }
-        }
        y:35
        function showPopup() {
            d.changeFlag = true
@ -387,7 +380,7 @@ FluButton {
            }
            var pos = control.mapToItem(null, 0, 0)
            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height
+                popup.y = control.height-1
            } else if(pos.y>container.height){
                popup.y = -container.height
            } else {
--- a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
@ -52,8 +52,6 @@ FluButton {
    }
    Menu{
        id:popup
-        height: container.height
-        width: container.width
        modal: true
        Overlay.modal: Item {}
        enter: Transition {
@ -74,13 +72,9 @@ FluButton {
            }
        }
        contentItem: Item{
-            clip: true
-            Rectangle{
            id:container
-                width: 300
-                height: 360
-                radius: 4
-                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            implicitWidth: 300
+            implicitHeight: 360
            ColumnLayout  {
                anchors.fill: parent
                spacing: 0
@ -610,22 +604,23 @@ FluButton {
                }
            }
        }
-        }
-        background: Item{
+        background:Rectangle{
+            radius: 5
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
-                radius: 4
+                radius: 5
            }
        }
        function showPopup() {
            var pos = control.mapToItem(null, 0, 0)
            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height
+                popup.y = control.height - 1
            } else if(pos.y>container.height){
                popup.y = -container.height
            } else {
                popup.y = d.window.height-(pos.y+container.height)
            }
-            popup.x = -(popup.width-control.width)/2
            popup.open()
        }
    }
--- a/src/Qt6/imports/FluentUI/Controls/FluColorPicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluColorPicker.qml
@ -13,16 +13,15 @@ Button{
    property color current : Qt.rgba(1,1,1,1)
    signal accepted()
    property int colorHandleRadius: 8
-    property string cancelText: "取消"
-    property string okText: "确定"
-    property string titleText: "颜色选择器"
-    property string editText: "编辑颜色"
-    property string redText: "红色"
-    property string greenText: "绿色"
-    property string blueText: "蓝色"
-    property string opacityText: "透明度"
-    background:
-        Rectangle{
+    property string cancelText: qsTr("Cancel")
+    property string okText: qsTr("OK")
+    property string titleText: qsTr("Color Picker")
+    property string editText: qsTr("Edit Color")
+    property string redText: qsTr("Red")
+    property string greenText: qsTr("Green")
+    property string blueText: qsTr("Blue")
+    property string opacityText: qsTr("Opacity")
+    background: Rectangle{
        id:layout_color
        radius: 5
        color:"#00000000"
--- a/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluComboBox.qml
@ -134,10 +134,9 @@ T.ComboBox {
            }
        }
        background:Rectangle{
-            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
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
                radius: 5
            }
--- a/src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluDatePicker.qml
@ -41,7 +41,7 @@ FluButton {
        id:divider_1
        width: 1
        x:  parent.width/3
-        height: parent.height-1
+        height: parent.height - 1
        color: control.dividerColor
        visible: showYear
    }
@ -49,7 +49,7 @@ FluButton {
        id:divider_2
        width: 1
        x: showYear ? parent.width*2/3 :  parent.width/2
-        height: parent.height-1
+        height: parent.height - 1
        color: control.dividerColor
    }
    FluText{
@ -95,8 +95,6 @@ FluButton {
    Menu{
        id:popup
        modal: true
-        width: container.width
-        height: container.height
        Overlay.modal: Item {}
        enter: Transition {
            reversible: true
@ -115,35 +113,31 @@ FluButton {
                duration: FluTheme.animationEnabled ? 83 : 0
            }
        }
-        background:Item{
+        background:Rectangle{
+            radius: 5
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
-                radius: 4
+                radius: 5
            }
        }
        contentItem: Item{
-            clip: true
-            Rectangle{
            id:container
-                radius: 4
-                width: 300
-                height: 340
-                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            implicitHeight: 340
+            implicitWidth: 300
            MouseArea{
                anchors.fill: parent
            }
-                FluShadow{
-                    radius: 4
-                }
            RowLayout{
                id:layout_content
                spacing: 0
                width: parent.width
-                    height: 300
+                height: 280
                Component{
                    id:list_delegate
                    Item{
-                            height:38
-                            width:getListView().width
+                        height: 38
+                        width: getListView().width
                        function getListView(){
                            if(type === 0)
                                return list_view_1
@ -165,7 +159,7 @@ FluButton {
                                if(item_mouse.containsMouse){
                                    return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                                }
-                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                                return Qt.rgba(0,0,0,0)
                            }
                            radius: 3
                            MouseArea{
@ -213,8 +207,9 @@ FluButton {
                }
                ListView{
                    id:list_view_1
-                        width: 100
-                        height: parent.height
+                    Layout.preferredWidth: 100
+                    Layout.preferredHeight: parent.height - 2
+                    Layout.alignment: Qt.AlignVCenter
                    boundsBehavior:Flickable.StopAtBounds
                    ScrollBar.vertical: FluScrollBar {}
                    model: generateYearArray(1924,2048)
@ -231,14 +226,16 @@ FluButton {
                    }
                }
                Rectangle{
-                        width: 1
-                        height: parent.height
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: parent.height
                    color: control.dividerColor
+                    visible: showYear
                }
                ListView{
                    id:list_view_2
-                        width: showYear ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: showYear ? 99 : 150
+                    Layout.preferredHeight: parent.height - 2
+                    Layout.alignment: Qt.AlignVCenter
                    clip: true
                    ScrollBar.vertical: FluScrollBar {}
                    preferredHighlightBegin: 0
@ -253,20 +250,20 @@ FluButton {
                    }
                }
                Rectangle{
-                        width: 1
-                        height: parent.height
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: parent.height
                    color: control.dividerColor
                }
                ListView{
                    id:list_view_3
-                        width:  showYear ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: showYear ? 99 : 150
+                    Layout.preferredHeight: parent.height - 2
+                    Layout.alignment: Qt.AlignVCenter
                    clip: true
                    preferredHighlightBegin: 0
                    preferredHighlightEnd: 0
                    highlightMoveDuration: 0
                    ScrollBar.vertical: FluScrollBar {}
-                        Layout.alignment: Qt.AlignVCenter
                    boundsBehavior:Flickable.StopAtBounds
                    delegate: FluLoader{
                        property var model: modelData
@ -276,17 +273,12 @@ FluButton {
                    }
                }
            }
-                Rectangle{
-                    width: parent.width
-                    height: 1
-                    anchors.top: layout_content.bottom
-                    color: control.dividerColor
-                }
            Rectangle{
                id:layout_actions
-                    height: 40
-                    radius: 5
+                height: 60
                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
+                border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
+                radius: 5
                anchors{
                    bottom:parent.bottom
                    left: parent.left
@ -339,7 +331,6 @@ FluButton {
                }
            }
        }
-        }
        y:35
        function showPopup() {
            d.changeFlag = true
@ -360,7 +351,7 @@ FluButton {
            text_day.text = day
            var pos = control.mapToItem(null, 0, 0)
            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height
+                popup.y = control.height-1
            } else if(pos.y>container.height){
                popup.y = -container.height
            } else {
--- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
@ -778,9 +778,9 @@ Rectangle {
            timer_vertical_force_layout.restart()
        }
        Connections{
-            target: table_model
-            function onRowCountChanged(){
-                header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1}))
+            target: table_view
+            function onRowsChanged(){
+                header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1}))
            }
        }
        Timer{
--- a/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTimePicker.qml
@ -58,14 +58,14 @@ FluButton {
        id: divider_1
        width: 1
        x: isH ? parent.width/3 : parent.width/2
-        height: parent.height-1
+        height: parent.height - 1
        color: dividerColor
    }
    Rectangle{
        id: divider_2
        width: 1
        x: parent.width*2/3
-        height: parent.height-1
+        height: parent.height - 1
        color: dividerColor
        visible: isH
    }
@ -111,8 +111,6 @@ FluButton {
    }
    Menu{
        id:popup
-        width: container.width
-        height: container.height
        modal: true
        Overlay.modal: Item {}
        enter: Transition {
@ -132,19 +130,18 @@ FluButton {
                duration: FluTheme.animationEnabled ? 83 : 0
            }
        }
-        background:Item{
+        background:Rectangle{
+            radius: 5
+            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
+            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
            FluShadow{
-                radius: 4
+                radius: 5
            }
        }
        contentItem: Item{
-            clip: true
-            Rectangle{
            id:container
-                height: 340
-                width: 300
-                radius: 4
-                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
+            implicitHeight: 340
+            implicitWidth: 300
            MouseArea{
                anchors.fill: parent
            }
@ -152,7 +149,7 @@ FluButton {
                id:layout_content
                spacing: 0
                width: parent.width
-                    height: 300
+                height: 280
                Component{
                    id:list_delegate
                    Item{
@ -179,7 +176,7 @@ FluButton {
                                if(item_mouse.containsMouse){
                                    return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                                }
-                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
+                                return Qt.rgba(0,0,0,0)
                            }
                            radius: 3
                            MouseArea{
@ -219,8 +216,9 @@ FluButton {
                }
                ListView{
                    id:list_view_1
-                        width: isH ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: isH ? 100 : 150
+                    Layout.preferredHeight: parent.height-2
+                    Layout.alignment: Qt.AlignVCenter
                    boundsBehavior:Flickable.StopAtBounds
                    ScrollBar.vertical: FluScrollBar {}
                    preferredHighlightBegin: 0
@ -236,14 +234,15 @@ FluButton {
                    }
                }
                Rectangle{
-                        width: 1
-                        height: parent.height
+                    Layout.preferredWidth: 1
+                    Layout.preferredHeight: parent.height
                    color: control.dividerColor
                }
                ListView{
                    id:list_view_2
-                        width:  isH ? 100 : 150
-                        height: parent.height
+                    Layout.preferredWidth: isH ? 99 : 150
+                    Layout.preferredHeight: parent.height-2
+                    Layout.alignment: Qt.AlignVCenter
                    model: generateArray(0,59)
                    clip: true
                    preferredHighlightBegin: 0
@ -266,8 +265,8 @@ FluButton {
                }
                ListView{
                    id:list_view_3
-                        width: 100
-                        height: 76
+                    Layout.preferredWidth: 100
+                    Layout.preferredHeight: 76
                    model: [control.amText,control.pmText]
                    clip: true
                    visible: isH
@ -285,17 +284,12 @@ FluButton {
                    }
                }
            }
-                Rectangle{
-                    width: parent.width
-                    height: 1
-                    anchors.top: layout_content.bottom
-                    color: control.dividerColor
-                }
            Rectangle{
                id:layout_actions
-                    height: 40
-                    radius: 5
+                height: 60
                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
+                border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
+                radius: 5
                anchors{
                    bottom:parent.bottom
                    left: parent.left
@ -353,7 +347,6 @@ FluButton {
                }
            }
        }
-        }
        y:35
        function showPopup() {
            d.changeFlag = true
@ -387,7 +380,7 @@ FluButton {
            }
            var pos = control.mapToItem(null, 0, 0)
            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height
+                popup.y = control.height-1
            } else if(pos.y>container.height){
                popup.y = -container.height
            } else {
--- a/src/fluentui_en_US.ts
+++ b/src/fluentui_en_US.ts
@ -70,6 +70,57 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>FluColorPicker</name>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
+        <source>Color Picker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
+        <source>Edit Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
+        <source>Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
+        <source>Green</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
+        <source>Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
+        <source>Opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>FluContentDialog</name>
    <message>
@ -94,31 +145,31 @@
 <context>
    <name>FluDatePicker</name>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
        <source>Year</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
        <source>Month</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
        <source>Day</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="15"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
        <source>OK</source>
        <translation type="unfinished"></translation>
@ -212,31 +263,37 @@
    <name>FluTimePicker</name>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
        <source>AM</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
        <source>PM</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
        <source>Hour</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
        <source>Minute</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
        <source>Cancel</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
        <source>OK</source>
        <translation type="unfinished"></translation>
    </message>
@ -265,8 +322,8 @@
 <context>
    <name>FluWindow</name>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="285"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="284"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="335"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="334"/>
        <source>Loading...</source>
        <translation type="unfinished"></translation>
    </message>
--- a/src/fluentui_zh_CN.ts
+++ b/src/fluentui_zh_CN.ts
@ -70,6 +70,57 @@
        <translation type="unfinished">选择日期</translation>
    </message>
 </context>
+<context>
+    <name>FluColorPicker</name>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="16"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="17"/>
+        <source>OK</source>
+        <translation type="unfinished">确定</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="18"/>
+        <source>Color Picker</source>
+        <translation type="unfinished">颜色选择器</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="19"/>
+        <source>Edit Color</source>
+        <translation type="unfinished">编辑颜色</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="20"/>
+        <source>Red</source>
+        <translation type="unfinished">红色</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="21"/>
+        <source>Green</source>
+        <translation type="unfinished">绿色</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="22"/>
+        <source>Blue</source>
+        <translation type="unfinished">蓝色</translation>
+    </message>
+    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluColorPicker.qml" line="23"/>
+        <source>Opacity</source>
+        <translation type="unfinished">透明度</translation>
+    </message>
+</context>
 <context>
    <name>FluContentDialog</name>
    <message>
@ -94,31 +145,31 @@
 <context>
    <name>FluDatePicker</name>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="10"/>
        <source>Year</source>
        <translation type="unfinished">年</translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="11"/>
        <source>Month</source>
        <translation type="unfinished">月</translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="12"/>
        <source>Day</source>
        <translation type="unfinished">日</translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="13"/>
        <source>Cancel</source>
        <translation type="unfinished">取消</translation>
    </message>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="15"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
        <location filename="Qt6/imports/FluentUI/Controls/FluDatePicker.qml" line="14"/>
        <source>OK</source>
        <translation type="unfinished">确定</translation>
@ -212,31 +263,37 @@
    <name>FluTimePicker</name>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="11"/>
        <source>AM</source>
        <translation type="unfinished">上午</translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="12"/>
        <source>PM</source>
        <translation type="unfinished">下午</translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="13"/>
        <source>Hour</source>
        <translation type="unfinished">时</translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="14"/>
        <source>Minute</source>
        <translation type="unfinished">分</translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="15"/>
        <source>Cancel</source>
        <translation type="unfinished">取消</translation>
    </message>
    <message>
        <location filename="Qt5/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluTimePicker.qml" line="16"/>
        <source>OK</source>
        <translation type="unfinished">确定</translation>
    </message>
@ -265,8 +322,8 @@
 <context>
    <name>FluWindow</name>
    <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="285"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="284"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="335"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="334"/>
        <source>Loading...</source>
        <translation type="unfinished">加载中...</translation>
    </message>
Author	SHA1	Message	Date
$朱子楚\zhuzi$ 朱子楚\zhuzi	bc4510077f	update	2024-04-19 01:04:13 +08:00
$朱子楚\zhuzi$ 朱子楚\zhuzi	179bc8b21f	update	2024-04-19 00:42:35 +08:00