update

.gitignore

@@ -1,14 +1,3 @@
-# C++ objects and libs
-*.slo
-*.lo
-*.o
-*.a
-*.la
-*.lai
-*.so
-*.dll
-*.dylib
-
 # Qt-es
 object_script.*.Release
 object_script.*.Debug

README.md

@@ -57,12 +57,21 @@
 |FluTooltip|tooltip提示框||
 |FluTreeView|树控件||
 |FluTheme|主题设置|支持主题颜色切换，夜间模式|
+|FluCarousel|轮播图组件|支持无限轮播|
+|FluTimePicker|时间选择器||
+|FluDatePicker|日期选择器||
+|FluMenu|菜单Popup||
+|FluNavigationView|响应式导航布局||
 
 # 部分效果预览
 
-## 主页
+## 一个聊天Demo，调用了ChatGPT的接口
 
-![](doc/preview/main.png)
+![](doc/preview/chatgpt.png)
+
+## 各种Button按钮
+
+![](doc/preview/buttons.png)
 
 ## 主题颜色切换、夜间模式
 
@@ -72,10 +81,14 @@
 
 ![](doc/preview/treeview.png)
 
-## Toast组件
+## 轮播图组件
+
+![](doc/preview/carousel.png)
+
+## InfoBar提示框组件
 
 ![](doc/preview/infobar.png)
 
-## Rectangle组件
+## 多窗口路由跳转
 
-![](doc/preview/rectangle.png)
+![](doc/preview/multiwindow.png)

example/App.qml

@@ -12,9 +12,10 @@ Window {
         FluApp.init(app,properties)
         FluTheme.isDark = false
         FluApp.routes = {
-            "/":"qrc:/MainPage.qml",
-            "/Setting":"qrc:/SettingPage.qml",
-            "/About":"qrc:/AboutPage.qml",
+            "/":"qrc:/page/MainPage.qml",
+            "/about":"qrc:/page/AboutPage.qml",
+            "/login":"qrc:/page/LoginPage.qml",
+            "/chat":"qrc:/page/ChatPage.qml",
         }
         FluApp.initialRoute = "/"
         FluApp.run()

example/ChatController.cpp

@@ -0,0 +1,56 @@
+#include "ChatController.h"
+
+ChatController::ChatController(QObject *parent)
+    : QObject{parent}
+{
+    isLoading(false);
+    networkManager = new QNetworkAccessManager(this);
+}
+
+
+void ChatController::sendMessage(const QString& text){
+    isLoading(true);
+    QUrl apiUrl("https://api.openai.com/v1/chat/completions");
+    QNetworkRequest request(apiUrl);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    request.setRawHeader("Authorization", QString::fromStdString("Bearer %1").arg(QString::fromUtf8(QByteArray::fromBase64(baseKey.toUtf8()))).toUtf8());
+    QJsonObject requestData;
+    requestData.insert("model", "gpt-3.5-turbo");
+    messages.append(createMessage("user",text));
+    requestData.insert("messages", messages);
+    QJsonDocument requestDoc(requestData);
+    QByteArray requestDataBytes = requestDoc.toJson();
+    QNetworkReply* reply = networkManager->post(request, requestDataBytes);
+    connect(reply, &QNetworkReply::finished,this, [=]() {
+        if (reply->error() == QNetworkReply::NoError) {
+            QString responseString = QString::fromUtf8(reply->readAll());
+            qDebug() << responseString;
+            QJsonDocument doc = QJsonDocument::fromJson(responseString.toUtf8());
+            QJsonObject jsonObj = doc.object();
+            QString text = jsonObj.value("choices").toArray().at(0).toObject().value("message").toObject().value("content").toString();
+            if(text.isEmpty()){
+                text = "响应错误：content为空数据";
+            }else{
+                messages.append(createMessage("assistant",text));
+            }
+            responseData(text.trimmed());
+        } else {
+            responseData("网络错误："+reply->errorString());
+        }
+        isLoading(false);
+        reply->deleteLater();
+    });
+}
+
+QJsonObject ChatController::createMessage(const QString& role,const QString& content){
+    QJsonObject message;
+    message.insert("role",role);
+    message.insert("content",content);
+    return message;
+}
+
+void ChatController::clipText(const QString& text){
+    qDebug()<<text;
+    QClipboard *clipboard = QGuiApplication::clipboard();
+    clipboard->setText(text);
+}

example/ChatController.h

@@ -0,0 +1,35 @@
+#ifndef CHATCONTROLLER_H
+#define CHATCONTROLLER_H
+
+#include <QObject>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QJsonObject>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QGuiApplication>
+#include <QClipboard>
+#include <QByteArray>
+#include <QFile>
+#include "stdafx.h"
+
+class ChatController : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(bool,isLoading)
+    Q_PROPERTY_AUTO(QString,responseData);
+public:
+    explicit ChatController(QObject *parent = nullptr);
+
+    Q_INVOKABLE void sendMessage(const QString& text);
+    Q_INVOKABLE void clipText(const QString& text);
+private:
+    QJsonObject createMessage(const QString& role,const QString& content);
+
+private:
+    QNetworkAccessManager* networkManager;
+    QJsonArray messages;
+    QString baseKey = "c2stbXgxWm5MQkZ5TzhNYzNmRWl6eDZUM0JsYmtGSnNBWjNiakJjSXB6WGN3QW9KSk11";
+};
+
+#endif // CHATCONTROLLER_H

example/SettingPage.qml

@@ -1,29 +0,0 @@
-import QtQuick 2.15
-import FluentUI 1.0
-
-FluWindow {
-
-    width: 500
-    height: 600
-    title:"设置"
-
-    FluAppBar{
-        id:appbar
-        title:"设置"
-    }
-
-    FluText{
-        text:"设置"
-        fontStyle: FluText.Display
-        anchors.centerIn: parent
-
-        MouseArea{
-            anchors.fill: parent
-            onClicked: {
-                FluApp.navigate("/About")
-            }
-        }
-
-    }
-
-}

example/T_Badge.qml

@@ -0,0 +1,101 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import QtGraphicalEffects 1.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"Badge"
+
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 106
+        paddings: 10
+
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"一般出现在通知图标或头像的右上角，用于显示需要处理的消息条数"
+            }
+
+            Row{
+                spacing: 20
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        count:0
+                    }
+                }
+
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        count:5
+                    }
+                }
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        count:50
+                    }
+                }
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        count:100
+                    }
+                }
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        isDot:true
+                    }
+                }
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        count:99
+                        color: Qt.rgba(250/255,173/255,20/255,1)
+                    }
+                }
+                Rectangle{
+                    width: 40
+                    height: 40
+                    radius:  8
+                    color: Qt.rgba(191/255,191/255,191/255,1)
+                    FluBadge{
+                        count:99
+                        color: Qt.rgba(82/255,196/255,26/255,1)
+                    }
+                }
+            }
+        }
+    }
+
+}

example/T_Buttons.qml

@@ -14,6 +14,37 @@ FluScrollablePage{
         text:"支持Tab键切换焦点，空格键执行点击事件"
     }
 
+    FluArea{
+        width: parent.width
+        height: 68
+        paddings: 10
+
+        FluTextButton{
+            disabled:text_button_switch.selected
+            text:"Text Button"
+            onClicked: {
+                showInfo("点击Text Button")
+            }
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_button_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+
     FluArea{
         width: parent.width
         height: 68
@@ -40,8 +71,6 @@ FluScrollablePage{
             FluToggleSwitch{
                 id:button_switch
                 Layout.alignment: Qt.AlignRight
-            }
-            FluText{
                 text:"Disabled"
             }
         }
@@ -73,8 +102,6 @@ FluScrollablePage{
             FluToggleSwitch{
                 id:filled_button_switch
                 Layout.alignment: Qt.AlignRight
-            }
-            FluText{
                 text:"Disabled"
             }
         }
@@ -108,8 +135,47 @@ FluScrollablePage{
             FluToggleSwitch{
                 id:icon_button_switch
                 Layout.alignment: Qt.AlignRight
+                text:"Disabled"
             }
-            FluText{
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        height: 68
+        paddings: 10
+
+        FluDropDownButton{
+            disabled:drop_down_button_switch.selected
+            text:"DropDownButton"
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            items:[
+                FluMenuItem{
+                    text:"Menu_1"
+                },
+                FluMenuItem{
+                    text:"Menu_2"
+                },
+                FluMenuItem{
+                    text:"Menu_3"
+                },
+                FluMenuItem{
+                    text:"Menu_4"
+                }
+            ]
+        }
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:drop_down_button_switch
+                Layout.alignment: Qt.AlignRight
                 text:"Disabled"
             }
         }
@@ -151,8 +217,6 @@ FluScrollablePage{
             FluToggleSwitch{
                 id:radio_button_switch
                 Layout.alignment: Qt.AlignRight
-            }
-            FluText{
                 text:"Disabled"
             }
         }
@@ -183,10 +247,10 @@ FluScrollablePage{
             FluToggleSwitch{
                 id:check_box_switch
                 Layout.alignment: Qt.AlignRight
-            }
-            FluText{
                 text:"Disabled"
             }
         }
     }
+
+
 }

example/T_CalendarPicker.qml

@@ -0,0 +1,35 @@
+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:"CalendarPicker"
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 350
+        paddings: 10
+        FluCalendarView{
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+        ColumnLayout{
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluCalendarPicker{
+            }
+        }
+    }
+
+}

example/T_Carousel.qml

@@ -0,0 +1,36 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import QtGraphicalEffects 1.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"Carousel"
+
+    FluArea{
+        width: parent.width
+        height: 370
+        paddings: 10
+        Layout.topMargin: 20
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+            FluText{
+                text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
+            }
+            FluCarousel{
+                id:carousel
+                Layout.topMargin: 20
+                Layout.leftMargin: 5
+                Component.onCompleted: {
+                    carousel.setData([{url:"qrc:/res/image/banner_1.jpg"},{url:"qrc:/res/image/banner_2.jpg"},{url:"qrc:/res/image/banner_3.jpg"}])
+                }
+            }
+        }
+    }
+}

example/T_ColorPicker.qml

@@ -0,0 +1,57 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtGraphicalEffects 1.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"ColorPicker"
+
+    FluArea{
+        width: parent.width
+        height: 280
+        Layout.topMargin: 20
+        paddings: 10
+        ColumnLayout{
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+            FluText{
+                text:"此颜色组件是Github上大佬封装的"
+            }
+            FluTextButton{
+                leftPadding: 0
+                rightPadding: 0
+                text:"https://github.com/rshest/qml-colorpicker"
+                onClicked: {
+                    Qt.openUrlExternally(text)
+                }
+            }
+            FluColorView{
+
+            }
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 60
+        paddings: 10
+
+        RowLayout{
+            FluText{
+                text:"点击选择颜色->"
+                Layout.alignment: Qt.AlignVCenter
+            }
+            FluColorPicker{
+
+            }
+        }
+    }
+
+}
+

example/T_Menu.qml

@@ -0,0 +1,54 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import QtGraphicalEffects 1.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"Menu"
+
+    FluButton{
+        text:"左击菜单"
+        Layout.topMargin: 20
+        Layout.leftMargin: 15
+        onClicked:{
+            menu.popup()
+        }
+    }
+
+
+    FluButton{
+        text:"右击菜单"
+        Layout.topMargin: 20
+        Layout.leftMargin: 15
+        onClicked: {
+            showSuccess("请按鼠标右击")
+        }
+        MouseArea{
+            anchors.fill: parent
+            acceptedButtons: Qt.RightButton
+            onClicked: {
+                menu.popup()
+            }
+        }
+    }
+
+    FluMenu{
+        id:menu
+        FluMenuItem{
+            text:"删除"
+            onClicked: {
+                showError("删除")
+            }
+        }
+        FluMenuItem{
+            text:"修改"
+            onClicked: {
+                showError("修改")
+            }
+        }
+    }
+
+}

example/T_MultiWindow.qml

@@ -0,0 +1,77 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"MultiWindow"
+
+    property string password: ""
+
+    property var loginPageRegister: registerForPageResult("/login")
+
+    Connections{
+        target: loginPageRegister
+        function onResult(data)
+        {
+            password = data.password
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        height: 100
+        paddings: 10
+        Layout.topMargin: 20
+
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"页面跳转，不携带任何参数"
+            }
+            FluButton{
+                text:"点击跳转"
+                onClicked: {
+                    FluApp.navigate("/about")
+                }
+            }
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        height: 130
+        paddings: 10
+        Layout.topMargin: 20
+
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"页面跳转，并携带参数用户名：zhuzichu"
+            }
+            FluButton{
+                text:"点击跳转到登录"
+                onClicked: {
+                    loginPageRegister.launch({username:"zhuzichu"})
+                }
+            }
+
+            FluText{
+                text:"登录窗口返回过来的密码->"+password
+            }
+        }
+    }
+
+
+
+}

example/T_TextBox.qml

@@ -13,17 +13,26 @@ FluScrollablePage{
         Layout.topMargin: 20
         placeholderText: "单行输入框"
         Layout.preferredWidth: 300
+        disabled:toggle_switch.selected
     }
     FluMultiLineTextBox{
         Layout.topMargin: 20
         Layout.preferredWidth: 300
         placeholderText: "多行输入框"
+        disabled:toggle_switch.selected
     }
     FluAutoSuggestBox{
         Layout.topMargin: 20
         values:generateRandomNames(100)
         placeholderText: "AutoSuggestBox"
         Layout.preferredWidth: 300
+        disabled:toggle_switch.selected
+    }
+
+    FluToggleSwitch{
+        id:toggle_switch
+        text:"Disabled"
+        Layout.topMargin: 20
     }
 
     function generateRandomNames(numNames) {

example/T_ToggleSwitch.qml

@@ -12,4 +12,8 @@ FluScrollablePage{
     FluToggleSwitch{
         Layout.topMargin: 20
     }
+    FluToggleSwitch{
+        Layout.topMargin: 20
+        text:"Disabled"
+    }
 }

example/T_Tooltip.qml

@@ -0,0 +1,75 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtGraphicalEffects 1.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"Tooltip"
+
+    FluText{
+        Layout.topMargin: 20
+        text:"鼠标悬停不动，弹出Tooltip"
+    }
+
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 68
+        paddings: 10
+
+        Column{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"FluIconButton的text属性自带Tooltip效果"
+            }
+            FluIconButton{
+                iconSource:FluentIcons.ChromeCloseContrast
+                iconSize: 15
+                text:"删除"
+                onClicked:{
+                    showSuccess("点击IconButton")
+                }
+            }
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 68
+        paddings: 10
+
+        Column{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"给一个Button添加Tooltip效果"
+            }
+            FluButton{
+                id:button_1
+                text:"删除"
+                onClicked:{
+                    showSuccess("点击一个Button")
+                }
+                FluTooltip{
+                    visible: button_1.hovered
+                    text:button_1.text
+                    delay: 1000
+                }
+            }
+        }
+    }
+
+
+}

example/example.pro

@@ -1,13 +1,16 @@
-QT += quick concurrent
+QT += quick concurrent network
 CONFIG += c++11
 
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 SOURCES += \
+        ChatController.cpp \
         main.cpp
 
 RESOURCES += qml.qrc
 
+RC_ICONS = favicon.ico
+
 #qnx: target.path = /tmp/$${TARGET}/bin
 #else: unix:!android: target.path = /opt/$${TARGET}/bin
 #!isEmpty(target.path): INSTALLS += target
@@ -22,3 +25,27 @@ CONFIG(debug,debug|release) {
 } else {
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../bin/release)
 }
+
+win32 {
+
+contains(QT_ARCH, i386) {
+    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
+    contains(QMAKE_CC, cl) {
+        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
+    } else {
+        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
+    }
+} else {
+    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR
+    contains(QMAKE_CC, cl) {
+        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
+    } else {
+        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
+    }
+}
+
+}
+
+
+HEADERS += \
+    ChatController.h

example/main.cpp

@@ -4,6 +4,7 @@
 #include <QDir>
 #include <QQuickWindow>
 #include <QProcess>
+#include "ChatController.h"
 
 QMap<QString, QVariant> properties(){
     QMap<QString, QVariant> map;
@@ -20,6 +21,9 @@ int main(int argc, char *argv[])
 //    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
     QGuiApplication app(argc, argv);
     QQmlApplicationEngine engine;
+
+    qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
+
     QMapIterator<QString, QVariant> iterator(properties());
     while (iterator.hasNext()) {
         iterator.next();

example/page/AboutPage.qml

@@ -1,4 +1,5 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
@@ -34,7 +35,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.0.6"
+                text:"v1.1.3"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }
@@ -69,7 +70,6 @@ FluWindow {
                 }
             }
         }
-
         RowLayout{
             spacing: 14
             Layout.topMargin: 20
@@ -78,22 +78,17 @@ FluWindow {
                 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
-                    }
+                    id: animation
+                    target: text_info
+                    property: "color"
+                    from: "red"
+                    to: "blue"
+                    duration: 1000
+                    running: true
+                    loops: Animation.Infinite
+                    easing.type: Easing.InOutQuad
+                }
             }
         }
-
-
     }
-
-
-
 }

example/page/ChatPage.qml

@@ -0,0 +1,261 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+import Controller 1.0
+import QtQuick.Dialogs 1.3
+
+FluWindow {
+
+    width: 680
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+
+    title:"ChatGPT"
+
+    onInitArgument:
+        (argument)=>{
+            scrollview.focus = true
+        }
+
+    ChatController{
+        id:controller
+
+        onResponseDataChanged: {
+            appendMessage(false,responseData)
+        }
+
+    }
+
+    ListModel{
+        id:model_message
+        ListElement{
+            isMy:false
+            text:"欢迎使用ChatGPT"
+        }
+        ListElement{
+            isMy:true
+            text:"好的，3Q"
+        }
+    }
+
+    FluAppBar{
+        id:appbar
+        title:"ChatGPT"
+    }
+
+    Component{
+        id:com_text
+        TextEdit {
+            id:item_text
+            text: message
+            wrapMode: Text.WrapAnywhere
+            readOnly: true
+            selectByMouse: true
+            selectByKeyboard: true
+            selectedTextColor: Qt.rgba(51,153,255,1)
+            color:FluColors.Black
+            selectionColor: {
+                if(FluTheme.isDark){
+                    return FluTheme.primaryColor.lighter
+                }else{
+                    return FluTheme.primaryColor.dark
+                }
+            }
+            width: Math.min(list_message.width-200,600,implicitWidth)
+            TapHandler{
+                acceptedButtons: Qt.RightButton
+                onTapped: {
+                    menu_item.showMenu(item_text.selectedText)
+                }
+            }
+        }
+    }
+
+    FluArea{
+        id:layout_content
+        anchors{
+            top: appbar.bottom
+            left: parent.left
+            right: parent.right
+            bottom: layout_bottom.top
+            margins: 10
+        }
+        color: FluTheme.isDark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(245/255,245/255,245/255,1)
+        ListView{
+            id:list_message
+            anchors.fill: parent
+            model:model_message
+            clip: true
+            ScrollBar.vertical: FluScrollBar {}
+            preferredHighlightBegin: 0
+            preferredHighlightEnd: 0
+            highlightMoveDuration: 0
+            header:Item{
+                width: list_message.width
+                height:20
+            }
+            footer:Item{
+                width: list_message.width
+                height:20
+            }
+            delegate: Item{
+                width: ListView.view.width
+                height: childrenRect.height
+
+                FluRectangle{
+                    id:item_avatar
+                    width: 30
+                    height: 30
+                    radius:[15,15,15,15]
+                    anchors{
+                        right: isMy ? parent.right : undefined
+                        rightMargin: isMy ? 20 : undefined
+                        left: isMy ? undefined : parent.left
+                        leftMargin: isMy ? undefined : 20
+                        top:parent.top
+                    }
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(100,100)
+                        source: isMy ? "qrc:/res/svg/avatar_2.svg" : "qrc:/res/image/logo_openai.png"
+                    }
+                }
+
+                Rectangle{
+                    id:item_layout_content
+                    color: isMy ? "#FF95EC69" : "#FFFFFF"
+                    width: item_msg_loader.width+10
+                    height: item_msg_loader.height+10
+                    radius: 3
+                    anchors{
+                        top: item_avatar.top
+                        right: isMy ? item_avatar.left : undefined
+                        rightMargin: isMy ? 10 : undefined
+                        left: isMy ? undefined : item_avatar.right
+                        leftMargin: isMy ? undefined : 10
+
+                    }
+
+                    Loader{
+                        id:item_msg_loader
+                        property var message: model.text
+                        anchors.centerIn: parent
+                        sourceComponent: com_text
+                    }
+                }
+
+
+                Item{
+                    id:item_layout_bottom
+                    width: parent.width
+                    anchors.top: item_layout_content.bottom
+                    height: 20
+                }
+            }
+        }
+    }
+
+    FluArea{
+        id:layout_bottom
+        height: 90
+        anchors{
+            bottom: parent.bottom
+            bottomMargin: 10
+            left: parent.left
+            right: parent.right
+            leftMargin: 10
+            rightMargin: 10
+        }
+
+
+        ScrollView{
+            id:scrollview
+            anchors{
+                bottom: parent.bottom
+                left: parent.left
+                right: button_send.left
+                bottomMargin: 10
+                leftMargin: 10
+                rightMargin: 10
+            }
+            height: Math.min(textbox.implicitHeight,64)
+            FluMultiLineTextBox{
+                id:textbox
+                focus:true
+                placeholderText: "请输入消息"
+            }
+        }
+
+        FluFilledButton{
+            id:button_send
+            text:controller.isLoading ? timer_loading.loadingText :"发送"
+            anchors{
+                bottom: parent.bottom
+                right: parent.right
+                bottomMargin: 10
+                rightMargin: 10
+            }
+            width: 60
+            disabled: controller.isLoading
+            onClicked:{
+                var text = textbox.text
+                appendMessage(true,text)
+                controller.sendMessage(text)
+                textbox.clear()
+            }
+
+            Timer{
+                id:timer_loading
+                property int count : 0
+                property string loadingText : ""
+                interval: 500
+                running: controller.isLoading
+                repeat: true
+                onTriggered: {
+                    switch(count%3){
+                    case 0:
+                        loadingText = "."
+                        break
+                    case 1:
+                        loadingText = ".."
+                        break
+                    case 2:
+                        loadingText = "..."
+                        break
+                    default:
+                        loadingText = ""
+                        break
+                    }
+                    count++
+                }
+            }
+
+        }
+    }
+
+    FluMenu{
+        id:menu_item
+        focus: false
+        property string selectedText: ""
+        FluMenuItem{
+            text:"复制"
+            onClicked: {
+                controller.clipText(menu_item.selectedText)
+                showSuccess("复制成功")
+            }
+        }
+        function showMenu(text){
+            menu_item.selectedText = text
+            menu_item.popup()
+        }
+    }
+
+    function appendMessage(isMy,text){
+        model_message.append({isMy:isMy,text:text})
+        list_message.positionViewAtEnd()
+    }
+
+}

example/page/LoginPage.qml

@@ -0,0 +1,72 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import FluentUI 1.0
+
+FluWindow {
+
+    id:window
+    width: 400
+    height: 400
+    minimumWidth: 400
+    minimumHeight: 400
+    maximumWidth: 400
+    maximumHeight: 400
+    modality:2
+
+    title:"登录"
+
+    onInitArgument:
+        (argument)=>{
+            textbox_uesrname.text = argument.username
+            textbox_password.focus =  true
+        }
+
+    FluAppBar{
+        id:appbar
+        title:"登录"
+    }
+
+    ColumnLayout{
+        anchors{
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+
+
+        FluAutoSuggestBox{
+            id:textbox_uesrname
+            values:["Admin","User"]
+            placeholderText: "请输入账号"
+            Layout.preferredWidth: 260
+            Layout.alignment: Qt.AlignHCenter
+        }
+
+        FluTextBox{
+            id:textbox_password
+            Layout.topMargin: 20
+            Layout.preferredWidth: 260
+            placeholderText: "请输入密码"
+            echoMode:TextInput.Password
+            Layout.alignment: Qt.AlignHCenter
+        }
+
+        FluFilledButton{
+            text:"登录"
+            Layout.alignment: Qt.AlignHCenter
+            Layout.topMargin: 20
+            onClicked:{
+                if(textbox_password.text === ""){
+                    showError("请随便输入一个密码")
+                    return
+                }
+                onResult({password:textbox_password.text})
+                window.close()
+            }
+        }
+
+    }
+
+
+
+}

example/page/MainPage.qml

@@ -9,7 +9,7 @@ import FluentUI 1.0
 FluWindow {
     id:rootwindow
     width: 860
-    height: 680
+    height: 600
     title: "FluentUI"
     minimumWidth: 500
     minimumHeight: 400
@@ -19,7 +19,6 @@ FluWindow {
         title: "FluentUI"
     }
 
-
     FluObject{
         id:original_items
 
@@ -73,6 +72,20 @@ FluWindow {
             }
         }
 
+        FluPaneItem{
+            title:"CalendarPicker"
+            onTap:{
+                nav_view.push("qrc:/T_CalendarPicker.qml")
+            }
+        }
+
+        FluPaneItem{
+            title:"ColorPicker"
+            onTap:{
+                nav_view.push("qrc:/T_ColorPicker.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Surface"
         }
@@ -90,12 +103,28 @@ FluWindow {
                 nav_view.push("qrc:/T_Progress.qml")
             }
         }
+
+        FluPaneItem{
+            title:"Badge"
+            onTap:{
+                nav_view.push("qrc:/T_Badge.qml")
+            }
+        }
+
         FluPaneItem{
             title:"Rectangle"
             onTap:{
                 nav_view.push("qrc:/T_Rectangle.qml")
             }
         }
+
+        FluPaneItem{
+            title:"Carousel"
+            onTap:{
+                nav_view.push("qrc:/T_Carousel.qml")
+            }
+        }
+
         FluPaneItem{
             title:"Expander"
             onTap:{
@@ -107,7 +136,6 @@ FluWindow {
             title:"Popus"
         }
 
-
         FluPaneItem{
             title:"Dialog"
             onTap:{
@@ -115,6 +143,20 @@ FluWindow {
             }
         }
 
+        FluPaneItem{
+            title:"Tooltip"
+            onTap:{
+                nav_view.push("qrc:/T_Tooltip.qml")
+            }
+        }
+
+        FluPaneItem{
+            title:"Menu"
+            onTap:{
+                nav_view.push("qrc:/T_Menu.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Navigation"
         }
@@ -126,6 +168,14 @@ FluWindow {
             }
         }
 
+
+        FluPaneItem{
+            title:"MultiWindow"
+            onTap:{
+                nav_view.push("qrc:/T_MultiWindow.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Theming"
         }
@@ -164,7 +214,7 @@ FluWindow {
         FluPaneItem{
             title:"关于"
             onTap:{
-                FluApp.navigate("/About")
+                FluApp.navigate("/about")
             }
         }
     }
@@ -181,6 +231,35 @@ FluWindow {
         items:original_items
         footerItems:footer_items
 
+        actions:[
+            Image {
+                width: 30
+                height: 30
+                Layout.preferredWidth: 30
+                Layout.preferredHeight: 30
+                sourceSize: Qt.size(60,60)
+                source: "qrc:/res/image/logo_openai.png"
+                Layout.rightMargin: 5
+                MouseArea{
+                    anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    onClicked: {
+                        FluApp.navigate("/chat")
+                    }
+                }
+            },
+            FluText{
+                text:"夜间模式"
+                fontStyle: FluText.Body
+            },
+            FluToggleSwitch{
+                selected: FluTheme.isDark
+                clickFunc:function(){
+                    FluTheme.isDark = !FluTheme.isDark
+                }
+            }
+        ]
+
         Component.onCompleted: {
             nav_view.setCurrentIndex(1)
             nav_view.push("qrc:/T_Buttons.qml")

example/qml.qrc

@@ -1,15 +1,6 @@
 <RCC>
     <qresource prefix="/">
-        <file>T_ToggleSwitch.qml</file>
-        <file>T_Typography.qml</file>
         <file>App.qml</file>
-        <file>SettingPage.qml</file>
-        <file>AboutPage.qml</file>
-        <file>T_Buttons.qml</file>
-        <file>T_Rectangle.qml</file>
-        <file>T_InfoBar.qml</file>
-        <file>T_Progress.qml</file>
-        <file>T_Slider.qml</file>
         <file>res/image/image_huoyin.webp</file>
         <file>res/svg/avatar_1.svg</file>
         <file>res/svg/avatar_2.svg</file>
@@ -23,14 +14,35 @@
         <file>res/svg/avatar_10.svg</file>
         <file>res/svg/avatar_11.svg</file>
         <file>res/svg/avatar_12.svg</file>
+        <file>page/AboutPage.qml</file>
+        <file>page/MainPage.qml</file>
+        <file>page/LoginPage.qml</file>
+        <file>T_ToggleSwitch.qml</file>
+        <file>T_Typography.qml</file>
         <file>T_Awesome.qml</file>
+        <file>T_Buttons.qml</file>
+        <file>T_Rectangle.qml</file>
+        <file>T_InfoBar.qml</file>
+        <file>T_Progress.qml</file>
+        <file>T_Slider.qml</file>
         <file>T_TextBox.qml</file>
         <file>T_Theme.qml</file>
         <file>T_Dialog.qml</file>
         <file>T_TreeView.qml</file>
         <file>T_Expander.qml</file>
-        <file>MainPage.qml</file>
         <file>T_TimePicker.qml</file>
         <file>T_DatePicker.qml</file>
+        <file>T_MultiWindow.qml</file>
+        <file>T_Menu.qml</file>
+        <file>res/image/banner_1.jpg</file>
+        <file>res/image/banner_2.jpg</file>
+        <file>res/image/banner_3.jpg</file>
+        <file>res/image/logo_openai.png</file>
+        <file>page/ChatPage.qml</file>
+        <file>T_Tooltip.qml</file>
+        <file>T_Badge.qml</file>
+        <file>T_CalendarPicker.qml</file>
+        <file>T_ColorPicker.qml</file>
+        <file>T_Carousel.qml</file>
     </qresource>
 </RCC>

scripts/windows-mingw-publish.ps1

@@ -17,7 +17,7 @@ function Main() {
 
     New-Item -ItemType Directory $archiveName
     # 拷贝exe
-    Copy-Item bin\release\$targetName $archiveName\
+    Copy-Item bin\release\* $archiveName\
     # 拷贝依赖
     windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
     # 删除不必要的文件

scripts/windows-publish.ps1

@@ -27,7 +27,7 @@ function Main() {
 
     New-Item -ItemType Directory $archiveName
     # 拷贝exe
-    Copy-Item bin\release\$targetName $archiveName\
+    Copy-Item bin\release\* $archiveName\
     # 拷贝依赖
     windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
     # 删除不必要的文件

src/FluApp.cpp

@@ -33,14 +33,18 @@ void FluApp::run(){
     navigate(initialRoute());
 }
 
-void FluApp::navigate(const QString& route){
+void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegister* fluRegister){
     if(!routes().contains(route)){
         qErrnoWarning("没有找到当前路由");
         return;
     }
     bool isAppWindow = route == initialRoute();
     FramelessView *view = new FramelessView();
-
+    if(fluRegister){
+        fluRegister->to(view);
+        view->setProperty("pageRegister",QVariant::fromValue(fluRegister));
+    }
+    view->setProperty("argument",argument);
     QMapIterator<QString, QVariant> iterator(properties);
     while (iterator.hasNext()) {
         iterator.next();
@@ -59,7 +63,6 @@ void FluApp::navigate(const QString& route){
     view->setSource((routes().value(route).toString()));
     if(isAppWindow){
         QObject::connect(view->engine(), &QQmlEngine::quit, qApp, &QCoreApplication::quit);
-//        QObject::connect(qApp, &QGuiApplication::aboutToQuit, qApp, [&view](){view->setSource({});});
     }else{
         view->closeDeleteLater();
     }

src/FluApp.h

@@ -7,6 +7,7 @@
 #include <QQmlContext>
 #include <QJsonObject>
 #include <QQmlEngine>
+#include "FluRegister.h"
 #include "FramelessView.h"
 #include "stdafx.h"
 
@@ -24,7 +25,7 @@ public:
 
     Q_INVOKABLE void run();
 
-    Q_INVOKABLE void navigate(const QString& route);
+    Q_INVOKABLE void navigate(const QString& route,const QJsonObject& argument  = {},FluRegister* fluRegister = nullptr);
 
     Q_INVOKABLE void init(QWindow *window,QMap<QString, QVariant> properties);
 
@@ -37,9 +38,8 @@ public:
     Q_INVOKABLE void clipText(const QString& text);
 
 private:
-
-    static FluApp* m_instance;
     QMap<QString, QVariant> properties;
+    static FluApp* m_instance;
     QWindow *appWindow;
 
 };

src/FluRegister.cpp

@@ -0,0 +1,20 @@
+#include "FluRegister.h"
+
+#include "FluApp.h"
+#include <QCoreApplication>
+
+FluRegister::FluRegister(QObject *parent)
+    : QObject{parent}
+{
+    from(nullptr);
+    to(nullptr);
+    path("");
+}
+
+void FluRegister::launch(const QJsonObject& argument){
+    FluApp::getInstance()->navigate(path(),argument,this);
+}
+
+void FluRegister::onResult(const QJsonObject& data){
+    Q_EMIT result(data);
+}

src/FluRegister.h

@@ -0,0 +1,24 @@
+#ifndef FLUREGISTER_H
+#define FLUREGISTER_H
+
+#include <QObject>
+#include <FramelessView.h>
+#include <QJsonObject>
+#include "stdafx.h"
+
+class FluRegister : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(FramelessView*,from)
+    Q_PROPERTY_AUTO(FramelessView*,to)
+    Q_PROPERTY_AUTO(QString,path);
+public:
+    explicit FluRegister(QObject *parent = nullptr);
+
+    Q_INVOKABLE void launch(const QJsonObject& argument  = {});
+    Q_INVOKABLE void onResult(const QJsonObject& data  = {});
+    Q_SIGNAL void result(const QJsonObject& data);
+
+};
+
+#endif // FLUREGISTER_H

src/Fluent.cpp

@@ -35,6 +35,7 @@ void Fluent::registerTypes(const char *uri){
 
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluArea.qml"),uri,major,minor,"FluArea");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluBadge.qml"),uri,major,minor,"FluBadge");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluContentPage.qml"),uri,major,minor,"FluContentPage");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluScrollablePage.qml"),uri,major,minor,"FluScrollablePage");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemHeader.qml"),uri,major,minor,"FluPaneItemHeader");
@@ -42,11 +43,14 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemSeparator.qml"),uri,major,minor,"FluPaneItemSeparator");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluNavigationView.qml"),uri,major,minor,"FluNavigationView");
 
-    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalendarDatePicker.qml"),uri,major,minor,"FluCalendarDatePicker");
-    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalenderView.qml"),uri,major,minor,"FluCalenderView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalendarPicker.qml"),uri,major,minor,"FluCalendarPicker");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalendarView.qml"),uri,major,minor,"FluCalendarView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluDatePicker.qml"),uri,major,minor,"FluDatePicker");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTimePicker.qml"),uri,major,minor,"FluTimePicker");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluColorView.qml"),uri,major,minor,"FluColorView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluColorPicker.qml"),uri,major,minor,"FluColorPicker");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCarousel.qml"),uri,major,minor,"FluCarousel");
 
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluAutoSuggestBox.qml"),uri,major,minor,"FluAutoSuggestBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluExpander.qml"),uri,major,minor,"FluExpander");
@@ -91,7 +95,7 @@ void Fluent::initializeEngine(QQmlEngine *engine, const char *uri)
     QFont font;
     font.setFamily("Microsoft YaHei");
     QGuiApplication::setFont(font);
-//    QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
+    //    QQuickWindow::setTextRenderType(QQuickWindow::NativeTextRendering);
 #endif
     QFontDatabase::addApplicationFont(":/com.zhuzichu/res/font/Segoe_Fluent_Icons.ttf");
     FluApp* app = FluApp::getInstance();

src/FluentUI.pro

@@ -15,6 +15,7 @@ HEADERS += \
     FluApp.h \
     FluColorSet.h \
     FluColors.h \
+    FluRegister.h \
     FluTheme.h \
     Fluent.h \
     FluentUI.h \
@@ -28,6 +29,7 @@ SOURCES += \
     FluApp.cpp \
     FluColorSet.cpp \
     FluColors.cpp \
+    FluRegister.cpp \
     FluTheme.cpp \
     Fluent.cpp \
     FluentUI.cpp \

src/FramelessView.h

@@ -4,9 +4,6 @@
 #include <QQuickView>
 #include <QRegion>
 
-//无边框窗口，主要用来实现自定义标题栏。
-//Windows平台支持拖动和改变大小，支持Aero效果
-//非Windows平台，去掉边框，不做其它处理。由Qml模拟resize和拖动。
 class FramelessViewPrivate;
 class FramelessView : public QQuickView
 {

src/WindowHelper.cpp

@@ -1,5 +1,7 @@
 #include "WindowHelper.h"
 
+#include "FluRegister.h"
+
 WindowHelper::WindowHelper(QObject *parent)
     : QObject{parent}
 {
@@ -10,11 +12,18 @@ void WindowHelper::setTitle(const QString& text){
     window->setTitle(text);
 }
 
-
 void WindowHelper::initWindow(FramelessView* window){
     this->window = window;
 }
 
+QJsonObject WindowHelper::getArgument(){
+    return window->property("argument").toJsonObject();
+}
+
+QVariant WindowHelper::getPageRegister(){
+    return window->property("pageRegister");
+}
+
 void WindowHelper::setMinimumWidth(int width){
     this->window->setMinimumWidth(width);
 }
@@ -27,3 +36,25 @@ void WindowHelper::setMinimumHeight(int height){
 void WindowHelper::setMaximumHeight(int height){
     this->window->setMaximumHeight(height);
 }
+void WindowHelper::updateWindow(){
+    this->window->setFlag(Qt::Window,false);
+    this->window->setFlag(Qt::Window,true);
+}
+void WindowHelper::setModality(int type){
+    if(type == 0){
+        this->window->setModality(Qt::NonModal);
+    }else if(type == 1){
+        this->window->setModality(Qt::WindowModal);
+    }else if(type == 2){
+        this->window->setModality(Qt::ApplicationModal);
+    }else{
+        this->window->setModality(Qt::NonModal);
+    }
+}
+
+QVariant WindowHelper::createRegister(const QString& path){
+    FluRegister *p = new FluRegister(this->window);
+    p->from(this->window);
+    p->path(path);
+    return  QVariant::fromValue(p);
+}

src/WindowHelper.h

@@ -5,6 +5,7 @@
 #include <QQuickWindow>
 #include <QQuickItem>
 #include <QWindow>
+#include <QJsonObject>
 #include "FramelessView.h"
 
 class WindowHelper : public QObject
@@ -20,6 +21,11 @@ public:
     Q_INVOKABLE void setMaximumWidth(int width);
     Q_INVOKABLE void setMinimumHeight(int height);
     Q_INVOKABLE void setMaximumHeight(int height);
+    Q_INVOKABLE QJsonObject getArgument();
+    Q_INVOKABLE QVariant getPageRegister();
+    Q_INVOKABLE void updateWindow();
+    Q_INVOKABLE void setModality(int type);
+    Q_INVOKABLE QVariant createRegister(const QString& path);
 
 private:
     FramelessView* window;

src/colorpicker/ColorPicker.qml

@@ -0,0 +1,234 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
+import "content"
+
+Rectangle {
+    id: colorPicker
+    property color colorValue: "transparent"
+    property bool enableAlphaChannel: true
+    property bool enableDetails: true
+    property int colorHandleRadius : 8
+    property color _changingColorValue : _hsla(hueSlider.value, sbPicker.saturation,sbPicker.brightness, alphaSlider.value)
+    on_ChangingColorValueChanged: {
+        colorValue = _changingColorValue
+    }
+
+    signal colorChanged(color changedColor)
+
+    implicitWidth: picker.implicitWidth
+    implicitHeight: picker.implicitHeight
+    color: "#00000000"
+    clip: true
+
+
+    RowLayout {
+        id: picker
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: colorHandleRadius
+        anchors.bottom: parent.bottom
+        spacing: 0
+
+
+        SBPicker {
+            id: sbPicker
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            Layout.minimumWidth: 200
+            Layout.minimumHeight: 200
+            hueColor: {
+                var v = 1.0-hueSlider.value
+                if(0.0 <= v && v < 0.16) {
+                    return Qt.rgba(1.0, 0.0, v/0.16, 1.0)
+                } else if(0.16 <= v && v < 0.33) {
+                    return Qt.rgba(1.0 - (v-0.16)/0.17, 0.0, 1.0, 1.0)
+                } else if(0.33 <= v && v < 0.5) {
+                    return Qt.rgba(0.0, ((v-0.33)/0.17), 1.0, 1.0)
+                } else if(0.5 <= v && v < 0.76) {
+                    return Qt.rgba(0.0, 1.0, 1.0 - (v-0.5)/0.26, 1.0)
+                } else if(0.76 <= v && v < 0.85) {
+                    return Qt.rgba((v-0.76)/0.09, 1.0, 0.0, 1.0)
+                } else if(0.85 <= v && v <= 1.0) {
+                    return Qt.rgba(1.0, 1.0 - (v-0.85)/0.15, 0.0, 1.0)
+                } else {
+                    return "red"
+                }
+            }
+        }
+
+        Item {
+            id: huePicker
+            width: 12
+            Layout.fillHeight: true
+            Layout.topMargin: colorHandleRadius
+            Layout.bottomMargin: colorHandleRadius
+
+            Rectangle {
+                anchors.fill: parent
+                id: colorBar
+                gradient: Gradient {
+                    GradientStop { position: 1.0;  color: "#FF0000" }
+                    GradientStop { position: 0.85; color: "#FFFF00" }
+                    GradientStop { position: 0.76; color: "#00FF00" }
+                    GradientStop { position: 0.5;  color: "#00FFFF" }
+                    GradientStop { position: 0.33; color: "#0000FF" }
+                    GradientStop { position: 0.16; color: "#FF00FF" }
+                    GradientStop { position: 0.0;  color: "#FF0000" }
+                }
+            }
+            ColorSlider {
+                id: hueSlider; anchors.fill: parent
+            }
+        }
+
+        Item {
+            id: alphaPicker
+            visible: enableAlphaChannel
+            width: 12
+            Layout.leftMargin: 4
+            Layout.fillHeight: true
+            Layout.topMargin: colorHandleRadius
+            Layout.bottomMargin: colorHandleRadius
+            Checkerboard { cellSide: 4 }
+            Rectangle {
+                anchors.fill: parent
+                gradient: Gradient {
+                    GradientStop { position: 0.0; color: "#FF000000" }
+                    GradientStop { position: 1.0; color: "#00000000" }
+                }
+            }
+            ColorSlider {
+                id: alphaSlider; anchors.fill: parent
+            }
+        }
+
+        Column {
+            id: detailColumn
+            Layout.leftMargin: 4
+            Layout.fillHeight: true
+            Layout.topMargin: colorHandleRadius
+            Layout.bottomMargin: colorHandleRadius
+            Layout.alignment: Qt.AlignRight
+            visible: enableDetails
+
+            PanelBorder {
+                width: parent.width
+                height: 30
+                visible: enableAlphaChannel
+                Checkerboard { cellSide: 5 }
+                Rectangle {
+                    width: parent.width; height: 30
+                    border.width: 1; border.color: "black"
+                    color: colorPicker.colorValue
+                }
+            }
+
+            Item {
+                width: parent.width
+                height: 1
+            }
+
+
+            PanelBorder {
+                id: colorEditBox
+                height: 15; width: parent.width
+                TextInput {
+                    anchors.fill: parent
+                    color: "#AAAAAA"
+                    selectionColor: "#FF7777AA"
+                    font.pixelSize: 11
+                    maximumLength: 9
+                    focus: false
+                    text: _fullColorString(colorPicker.colorValue, alphaSlider.value)
+                    selectByMouse: true
+                }
+            }
+
+            Item {
+                width: parent.width
+                height: 8
+            }
+
+            Column {
+                width: parent.width
+                spacing: 1
+                NumberBox { caption: "H:"; value: hueSlider.value.toFixed(2) }
+                NumberBox { caption: "S:"; value: sbPicker.saturation.toFixed(2) }
+                NumberBox { caption: "B:"; value: sbPicker.brightness.toFixed(2) }
+            }
+
+            Item {
+                width: parent.width
+                height: 8
+            }
+
+            Column {
+                width: parent.width
+                spacing: 1
+                NumberBox {
+                    caption: "R:"
+                    value: _getChannelStr(colorPicker.colorValue, 0)
+                    min: 0; max: 255
+                }
+                NumberBox {
+                    caption: "G:"
+                    value: _getChannelStr(colorPicker.colorValue, 1)
+                    min: 0; max: 255
+                }
+                NumberBox {
+                    caption: "B:"
+                    value: _getChannelStr(colorPicker.colorValue, 2)
+                    min: 0; max: 255
+                }
+            }
+
+            Item{
+                width: parent.width
+                height: 1
+            }
+
+            NumberBox {
+                visible: enableAlphaChannel
+                caption: "A:"; value: Math.ceil(alphaSlider.value*255)
+                min: 0; max: 255
+            }
+        }
+    }
+
+    function _hsla(h, s, b, a) {
+        var lightness = (2 - s)*b
+        var satHSL = s*b/((lightness <= 1) ? lightness : 2 - lightness)
+        lightness /= 2
+
+        var c = Qt.hsla(h, satHSL, lightness, a)
+
+        colorChanged(c)
+
+        return c
+    }
+
+    function _rgb(rgb, a) {
+
+        var c = Qt.rgba(rgb.r, rgb.g, rgb.b, a)
+
+        colorChanged(c)
+
+        return c
+    }
+
+    function _fullColorString(clr, a) {
+        return "#" + ((Math.ceil(a*255) + 256).toString(16).substr(1, 2) + clr.toString().substr(1, 6)).toUpperCase()
+    }
+
+    function _getChannelStr(clr, channelIdx) {
+        return parseInt(clr.toString().substr(channelIdx*2 + 1, 2), 16)
+    }
+
+    function setColor(color) {
+        var c = Qt.tint(color, "transparent")
+        alphaSlider.setValue(c.a)
+        colorPicker.colorValue = c
+    }
+}

src/colorpicker/content/Checkerboard.qml

@@ -0,0 +1,16 @@
+import QtQuick 2.15
+Grid {
+    id: root
+    property int cellSide: 5
+    anchors.fill: parent
+    rows: height/cellSide; columns: width/cellSide
+    clip: true
+    Repeater {
+        model: root.columns*root.rows
+        Rectangle {
+            width: root.cellSide; height: root.cellSide
+            color: (index%2 == 0) ? "gray" : "white"
+        }
+    }
+}
+

src/colorpicker/content/ColorSlider.qml

@@ -0,0 +1,43 @@
+import QtQuick 2.15
+
+Item {
+    property int cursorHeight: 7
+    property real value: (1 - pickerCursor.y/height)
+    width: 15
+    height: 300
+    Item {
+        id: pickerCursor
+        width: parent.width
+        Rectangle {
+            x: -3; y: -height*0.5
+            width: parent.width + 4; height: cursorHeight
+            border.color: "black"; border.width: 1
+            color: "transparent"
+            Rectangle {
+                anchors.fill: parent; anchors.margins: 2
+                border.color: "white"; border.width: 1
+                color: "transparent"
+            }
+        }
+    }
+    MouseArea {
+        y: -Math.round(cursorHeight/2)
+        height: parent.height+cursorHeight
+        anchors.left: parent.left
+        anchors.right: parent.right
+        function handleMouse(mouse) {
+            if (mouse.buttons & Qt.LeftButton) {
+                pickerCursor.y = Math.max(0, Math.min(height, mouse.y)-cursorHeight)
+            }
+        }
+        onPositionChanged: {
+            handleMouse(mouse)
+        }
+        onPressed: handleMouse(mouse)
+    }
+
+    function setValue(val) {
+        pickerCursor.y = height * (1 - val)
+    }
+}
+

src/colorpicker/content/NumberBox.qml

@@ -0,0 +1,39 @@
+import QtQuick 2.15
+
+Row {
+    property alias  caption: captionBox.text
+    property alias  value: inputBox.text
+    property alias  min: numValidator.bottom
+    property alias  max: numValidator.top
+    property alias  decimals: numValidator.decimals
+
+    width: 80;
+    height: 15
+    spacing: 4
+    //anchors.margins: 2
+    Text {
+        id: captionBox
+        width: 18; height: parent.height
+        color: "#AAAAAA"
+        font.pixelSize: 11; font.bold: true
+    }
+    PanelBorder {
+        height: parent.height
+        TextInput {
+            id: inputBox
+            color: "#AAAAAA"; selectionColor: "#FF7777AA"
+            font.pixelSize: 11            
+            maximumLength: 10
+            focus: false
+            readOnly: true
+            selectByMouse: true
+            validator: DoubleValidator {
+                id: numValidator
+                bottom: 0; top: 1; decimals: 2
+                notation: DoubleValidator.StandardNotation
+            }
+        }
+    }
+}
+
+

src/colorpicker/content/PanelBorder.qml

@@ -0,0 +1,18 @@
+import QtQuick 2.15
+
+Rectangle {
+    width : 40; height : 15; radius: 2
+    border.width: 1; border.color: "#FF101010"
+    color: "transparent"
+    anchors.leftMargin: 1; anchors.topMargin: 3
+    clip: true
+    Rectangle {
+        anchors.fill: parent; radius: 2
+        anchors.leftMargin: -1; anchors.topMargin: -1
+        anchors.rightMargin: 0; anchors.bottomMargin: 0
+        border.width: 1; border.color: "#FF525255"
+        color: "transparent"
+    }
+}
+
+

src/colorpicker/content/SBPicker.qml

@@ -0,0 +1,69 @@
+import QtQuick 2.15
+
+Item {
+    id: root
+    property color hueColor : "blue"
+    property real saturation : pickerCursor.x/(width-2*r)
+    property real brightness : 1 - pickerCursor.y/(height-2*r)
+    property int r : colorHandleRadius
+
+    Rectangle {
+        x : r
+        y : r + parent.height - 2 * r
+        rotation: -90
+        transformOrigin: Item.TopLeft
+        width: parent.height - 2 * r
+        height: parent.width - 2 * r
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#FFFFFF" }
+            GradientStop { position: 1.0; color: root.hueColor }
+        }
+    }
+    Rectangle {
+        x: r
+        y: r
+        width: parent.width - 2 * r
+        height: parent.height - 2 *  r
+        gradient: Gradient {
+            GradientStop { position: 1.0; color: "#FF000000" }
+            GradientStop { position: 0.0; color: "#00000000" }
+        }
+    }
+    Item {
+        id: pickerCursor
+        Rectangle {
+            width: r*2; height: r*2
+            radius: r
+            border.color: "black"; border.width: 2
+            color: "transparent"
+            Rectangle {
+                anchors.fill: parent; anchors.margins: 2;
+                border.color: "white"; border.width: 2
+                radius: width/2
+                color: "transparent"
+            }
+        }
+    }
+    MouseArea {
+        anchors.fill: parent
+        x: r
+        y: r
+        function handleMouse(mouse) {
+            if (mouse.buttons & Qt.LeftButton) {
+
+                pickerCursor.x = Math.max(0,Math.min(mouse.x - r,width-2*r));
+                pickerCursor.y = Math.max(0,Math.min(mouse.y - r,height-2*r));
+
+
+//                pickerCursor.x = Math.max(-r,Math.min(mouse.x - r,width+r));
+//                pickerCursor.y = Math.max(-r,Math.min(mouse.y - r,height+r));
+
+//                pickerCursor.x = Math.max(0, Math.min(width,  mouse.x) - 2 * r);
+//                pickerCursor.y = Math.max(0, Math.min(height, mouse.y) - 2 * r);
+            }
+        }
+        onPositionChanged: handleMouse(mouse)
+        onPressed: handleMouse(mouse)
+    }
+}
+

src/controls/FluAutoSuggestBox.qml

@@ -7,12 +7,19 @@ TextField{
     property var values:[]
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
-    property int iconSource: -1
+    property int iconSource: 0
+    property bool disabled: false
     signal itemClicked(string data)
 
     id:input
     width: 300
-    color: FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+    enabled: !disabled
+    color: {
+        if(disabled){
+            return FluTheme.isDark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+        }
+        return FluTheme.isDark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+    }
     selectionColor: {
         if(FluTheme.isDark){
             return FluTheme.primaryColor.lighter
@@ -22,6 +29,9 @@ TextField{
     }
     renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     placeholderTextColor: {
+        if(disabled){
+            return FluTheme.isDark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+        }
         if(focus){
             return FluTheme.isDark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
         }
@@ -112,7 +122,7 @@ TextField{
             iconSource: input.iconSource
             iconSize: 15
             opacity: 0.5
-            visible: input.iconSource != -1
+            visible: input.iconSource != 0
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right
@@ -152,6 +162,7 @@ TextField{
                 boundsBehavior: ListView.StopAtBounds
                 clip: true
                 currentIndex: -1
+                ScrollBar.vertical: FluScrollBar {}
                 header: Item{
                     width: input.width
                     height: visible ? 38 : 0
@@ -165,7 +176,6 @@ TextField{
                         }
                     }
                 }
-                ScrollBar.vertical: ScrollBar { }
                 delegate:Control{
                     width: input.width
                     padding:10

src/controls/FluBadge.qml

@@ -0,0 +1,77 @@
+import QtQuick 2.15
+
+Rectangle{
+
+    property bool isDot: false
+    property bool showZero: true
+    property int count: 0
+
+
+    id:control
+    color:Qt.rgba(255/255,77/255,79/255,1)
+    width: {
+        if(isDot)
+            return 10
+        if(count<10){
+            return 20
+        }else if(count<100){
+           return 30
+        }
+        return 40
+    }
+    height: {
+        if(isDot)
+            return 10
+        return 20
+    }
+    radius: {
+        if(isDot)
+            return 5
+        return 10
+    }
+    border.width: 1
+    border.color: Qt.rgba(1,1,1,1)
+    visible: {
+        if(showZero)
+            return true
+        return count!==0
+    }
+    anchors{
+        right: {
+            if(parent)
+                return parent.right
+            return undefined
+        }
+        top: {
+            if(parent)
+                return parent.top
+            return undefined
+        }
+        rightMargin: {
+            if(isDot){
+                return -2.5
+            }
+            return -(control.width/2)
+        }
+        topMargin: {
+            if(isDot){
+                return -2.5
+            }
+            return  -10
+        }
+    }
+
+    Text{
+        anchors.centerIn: parent
+        color: Qt.rgba(1,1,1,1)
+        visible: !isDot
+        text:{
+            if(count<100)
+                return count
+            return count+"+"
+        }
+    }
+
+
+
+}

src/controls/FluButton.qml

@@ -36,7 +36,6 @@ Button {
     }
     contentItem: FluText {
         text: control.text
-        anchors.centerIn: parent
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         color: {

src/controls/FluCalendarDatePicker.qml

@@ -1,5 +0,0 @@
-import QtQuick 2.15
-
-Item {
-
-}

src/controls/FluCalendarPicker.qml

@@ -0,0 +1,92 @@
+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
+
+    color: {
+        if(mouse_area.containsMouse){
+            return hoverColor
+        }
+        return normalColor
+    }
+    height: 30
+    width: 120
+    radius: 4
+    border.width: 1
+    border.color: dividerColor
+
+    MouseArea{
+        id:mouse_area
+        hoverEnabled: true
+        anchors.fill: parent
+        onClicked: {
+            popup.showPopup()
+        }
+    }
+
+    FluText{
+        id:text_date
+        anchors{
+            left: parent.left
+            right: parent.right
+            rightMargin: 30
+            top: parent.top
+            bottom: parent.bottom
+        }
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+        text:"请选择日期"
+    }
+
+    FluIcon{
+        iconSource: FluentIcons.Calendar
+        iconSize: 14
+        color: text_date.color
+        anchors{
+            verticalCenter: parent.verticalCenter
+            right: parent.right
+            rightMargin: 12
+        }
+    }
+
+
+    Popup{
+        id:popup
+        height: container.height
+        width: container.width
+        background: FluCalendarView{
+            id:container
+            onDateClicked:
+                (date)=>{
+                    popup.close()
+                    var year = date.getFullYear()
+                    var month = date.getMonth()
+                    var day =  date.getDate()
+                    text_date.text = year+"-"+(month+1)+"-"+day
+                }
+        }
+        contentItem: Item{}
+        function showPopup() {
+            var pos = root.mapToItem(null, 0, 0)
+            if(window.height>pos.y+root.height+popup.height){
+                popup.y = root.height
+            } else if(pos.y>popup.height){
+                popup.y = -popup.height
+            } else {
+                popup.y = window.height-(pos.y+popup.height)
+            }
+            popup.x = -(popup.width-root.width)/2
+            popup.open()
+        }
+    }
+}

src/controls/FluCalendarView.qml

@@ -0,0 +1,476 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+
+Item {
+
+    id:control
+    property int displayMode: FluCalendarView.Month
+
+    property var date: new Date()
+
+    property var currentDate : new Date()
+
+    property var toDay: new Date()
+
+    signal dateClicked(var date)
+
+    width: 280
+    height: 325
+
+    enum DisplayMode {
+        Month,
+        Year,
+        Decade
+    }
+
+    Component.onCompleted: {
+        updateMouth(date)
+    }
+
+    function createItemWeek(name){
+        return {type:0,date:new Date(),name:name,isDecade:false}
+    }
+
+    function createItemDay(date){
+        return {type:1,date:date,name:"",isDecade:false}
+    }
+
+    function createItemMonth(date){
+        return {type:2,date:date,name:"",isDecade:false}
+    }
+
+    function createItemYear(date,isDecade){
+        return {type:3,date:date,name:"",isDecade:isDecade}
+    }
+    
+    function updateDecade(date){
+        list_model.clear()
+        var year = date.getFullYear()
+        const decadeStart = Math.floor(year / 10) * 10;
+        for(var i = decadeStart ; i< decadeStart+10 ; i++){
+            list_model.append(createItemYear(new Date(i,0,1),true));
+        }
+        for(var j =  decadeStart+10 ; j< decadeStart+16 ; j++){
+            list_model.append(createItemYear(new Date(j,0,1),false));
+        }
+        title.text = decadeStart+"-"+(decadeStart+10)
+    }
+
+    function updateYear(date){
+        list_model.clear()
+        var year = date.getFullYear()
+        for(var i = 0 ; i< 12 ; i++){
+            list_model.append(createItemMonth(new Date(year,i)));
+        }
+        for(var j = 0 ; j< 4 ; j++){
+            list_model.append(createItemMonth(new Date(year+1,j)));
+        }
+        title.text = year+"年"
+    }
+
+    function updateMouth(date){
+        list_model.clear()
+        list_model.append([createItemWeek("一"),createItemWeek("二"),createItemWeek("三"),createItemWeek("四"),createItemWeek("五"),createItemWeek("六"),createItemWeek("日")])
+        var year = date.getFullYear()
+        var month = date.getMonth()
+        var day =  date.getDate()
+        var firstDayOfMonth = new Date(year, month, 1)
+        var dayOfWeek = firstDayOfMonth.getDay()
+        var headerSize = (dayOfWeek===0?7:dayOfWeek)-1
+        if(headerSize!==0){
+            var lastMonthYear = year;
+            var lastMonthMonth = month - 1
+            if (month === 0) {
+                lastMonthYear = year - 1
+                lastMonthMonth = 11
+            }
+            var lastMonthDays = new Date(lastMonthYear, lastMonthMonth+1, 0).getDate()
+            for (var i = headerSize-1; i >= 0; i--) {
+                list_model.append(createItemDay(new Date(lastMonthYear, lastMonthMonth,lastMonthDays-i)))
+            }
+        }
+        const lastDayOfMonth = new Date(year, month+1, 0).getDate()
+        for (let day = 1; day <= lastDayOfMonth; day++) {
+            list_model.append(createItemDay(new Date(year, month,day)))
+        }
+        var footerSize = 49-list_model.count
+        var nextMonthYear = year
+        var nextMonth = month + 1
+        if (month === 11) {
+            nextMonthYear = year + 1
+            nextMonth = 0
+        }
+        const nextDayOfMonth = new Date(nextMonthYear, nextMonth+1, 0).getDate()
+        for (let j = 1; j <= footerSize; j++) {
+            list_model.append(createItemDay(new Date(nextMonthYear, nextMonth,j)))
+        }
+        title.text = year+"年"+(month+1)+"月"
+    }
+
+
+    Component{
+        id:com_week
+        Item{
+            height: 40
+            width: 40
+            FluText{
+                text:name
+                anchors.centerIn: parent
+            }
+        }
+    }
+
+    Component{
+        id:com_year
+        Button{
+            id:item_control
+            property bool isYear: control.toDay.getFullYear() === date.getFullYear()
+            height: 70
+            width: 70
+            onClicked:{
+                control.date = date
+                displayMode = FluCalendarView.Year
+                updateYear(date)
+            }
+            background: Item{
+                Rectangle{
+                    width: 60
+                    height: 60
+                    radius: 4
+                    anchors.centerIn: parent
+                    color:{
+                        if(FluTheme.isDark){
+                            if(item_control.hovered){
+                                return Qt.rgba(1,1,1,0.05)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }else{
+                            if(item_control.hovered){
+                                return Qt.rgba(0,0,0,0.05)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }
+                    }
+                }
+                Rectangle{
+                    id:backgound_selected
+                    anchors.centerIn: parent
+                    width: 50
+                    height: 50
+                    radius: 25
+                    visible: isYear
+                    color: FluTheme.primaryColor.dark
+                }
+                FluText{
+                    text:date.getFullYear()
+                    anchors.centerIn: parent
+                    color: {
+                        if(isYear){
+                            return "#FFFFFF"
+                        }
+                        if(isDecade){
+                            return FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+                        }
+                        return Qt.rgba(150/255,150/255,150/255,1)
+                    }
+                }
+            }
+            contentItem: Item{}
+        }
+    }
+
+    Component{
+        id:com_month
+        Button{
+            id:item_control
+            property bool isYear: control.date.getFullYear() === date.getFullYear()
+            property bool isMonth: control.toDay.getFullYear() === date.getFullYear() && control.toDay.getMonth() === date.getMonth()
+            height: 70
+            width: 70
+            onClicked:{
+                control.date = date
+                displayMode = FluCalendarView.Month
+                updateMouth(date)
+            }
+            background: Item{
+                Rectangle{
+                    width: 60
+                    height: 60
+                    radius: 4
+                    anchors.centerIn: parent
+                    color:{
+                        if(FluTheme.isDark){
+                            if(item_control.hovered){
+                                return Qt.rgba(1,1,1,0.05)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }else{
+                            if(item_control.hovered){
+                                return Qt.rgba(0,0,0,0.05)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }
+                    }
+                }
+                Rectangle{
+                    id:backgound_selected
+                    anchors.centerIn: parent
+                    width: 50
+                    height: 50
+                    radius: 25
+                    visible: isMonth
+                    color: FluTheme.primaryColor.dark
+                }
+                FluText{
+                    text:(date.getMonth()+1)+"月"
+                    anchors.centerIn: parent
+                    color: {
+                        if(isMonth){
+                            return "#FFFFFF"
+                        }
+                        if(isYear){
+                            return FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+                        }
+                        return Qt.rgba(150/255,150/255,150/255,1)
+                    }
+                }
+            }
+            contentItem: Item{}
+        }
+    }
+
+
+    Component{
+        id:com_day
+        Button{
+            id:item_control
+            property bool isMonth: control.date.getMonth() === date.getMonth()
+            property bool isDay: control.currentDate.getFullYear() === date.getFullYear() && control.currentDate.getMonth() === date.getMonth() && control.currentDate.getDate() === date.getDate()
+            property bool isToDay: control.toDay.getFullYear() === date.getFullYear() && control.toDay.getMonth() === date.getMonth() && control.toDay.getDate() === date.getDate()
+            height: 40
+            width: 40
+            onClicked: {
+                currentDate = date
+                control.dateClicked(date)
+            }
+            background: Item{
+                Rectangle{
+                    width: 36
+                    height: 36
+                    radius: 4
+                    anchors.centerIn: parent
+                    color:{
+                        if(FluTheme.isDark){
+                            if(item_control.hovered){
+                                return Qt.rgba(1,1,1,0.05)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }else{
+                            if(item_control.hovered){
+                                return Qt.rgba(0,0,0,0.05)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }
+                    }
+                }
+
+                Rectangle{
+                    id:backgound_today
+                    anchors.centerIn: parent
+                    width: 36
+                    height: 36
+                    radius: 18
+                    color:"#00000000"
+                    visible: isDay
+                    border.color: FluTheme.primaryColor.dark
+                    border.width: 1
+                }
+
+                Rectangle{
+                    id:backgound_selected
+                    anchors.centerIn: parent
+                    width: 30
+                    height: 30
+                    radius: 15
+                    visible: isToDay
+                    color: FluTheme.primaryColor.dark
+                }
+
+                FluText{
+                    text:date.getDate()
+                    anchors.centerIn: parent
+                    color: {
+                        if(isToDay){
+                            return "#FFFFFF"
+                        }
+                        if(isMonth){
+                            return FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+                        }
+                        return Qt.rgba(150/255,150/255,150/255,1)
+                    }
+                }
+            }
+            contentItem: Item{}
+        }
+    }
+
+    FluArea{
+        anchors.fill: parent
+        radius: 5
+
+        FluShadow{
+            radius: 5
+        }
+
+        Rectangle{
+            id:layout_divider
+            height: 1
+            width: parent.width
+            color: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+            anchors{
+                top: parent.top
+                topMargin: 44
+            }
+        }
+
+        Item{
+            id:layout_top
+            anchors{
+                left: parent.left
+                right: parent.right
+                top: parent.top
+                bottom: layout_divider.top
+            }
+
+            FluTextButton{
+                id:title
+                leftPadding: 0
+                rightPadding: 0
+                anchors{
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: 14
+                }
+                disabled: displayMode === FluCalendarView.Decade
+                onClicked:{
+                    if(displayMode === FluCalendarView.Month){
+                        displayMode = FluCalendarView.Year
+                        updateYear(date)
+                    }else if(displayMode === FluCalendarView.Year){
+                        displayMode = FluCalendarView.Decade
+                        updateDecade(date)
+                    }
+                }
+            }
+
+            FluIconButton{
+                id:icon_up
+                iconSource: FluentIcons.CaretUpSolid8
+                iconSize: 10
+                anchors{
+                    verticalCenter: parent.verticalCenter
+                    right: icon_down.left
+                    rightMargin: 14
+                }
+                onClicked: {
+                    var year = date.getFullYear()
+                    var month = date.getMonth()
+                    if(displayMode === FluCalendarView.Month){
+                        var lastMonthYear = year;
+                        var lastMonthMonth = month - 1
+                        if (month === 0) {
+                            lastMonthYear = year - 1
+                            lastMonthMonth = 11
+                        }
+                        date = new Date(lastMonthYear,lastMonthMonth,1)
+                        updateMouth(date)
+                    }else if(displayMode === FluCalendarView.Year){
+                        date = new Date(year-1,month,1)
+                        updateYear(date)
+                    }else if(displayMode === FluCalendarView.Decade){
+                        date = new Date(Math.floor(year / 10) * 10-10,month,1)
+                        updateDecade(date)
+                    }
+                }
+            }
+
+            FluIconButton{
+                id:icon_down
+                iconSource: FluentIcons.CaretDownSolid8
+                iconSize: 10
+                anchors{
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                    rightMargin: 8
+                }
+                onClicked: {
+                    var year = date.getFullYear()
+                    var month = date.getMonth()
+                    if(displayMode === FluCalendarView.Month){
+                        var nextMonthYear = year
+                        var nextMonth = month + 1
+                        if (month === 11) {
+                            nextMonthYear = year + 1
+                            nextMonth = 0
+                        }
+                        date = new Date(nextMonthYear,nextMonth,1)
+                        updateMouth(date)
+                    }else if(displayMode === FluCalendarView.Year){
+                        date = new Date(year+1,month,1)
+                        updateYear(date)
+                    }else if(displayMode === FluCalendarView.Decade){
+                        date = new Date(Math.floor(year / 10) * 10+10,month,1)
+                        updateDecade(date)
+                    }
+                }
+            }
+        }
+
+        ListModel {
+            id:list_model
+        }
+
+        Item{
+            id:layout_bottom
+            anchors{
+                left: parent.left
+                right: parent.right
+                top: layout_divider.bottom
+                bottom: parent.bottom
+            }
+
+            GridView{
+                model: list_model
+                anchors.fill: parent
+                cellHeight: displayMode === FluCalendarView.Month ? 40 : 70
+                cellWidth: displayMode === FluCalendarView.Month ? 40 : 70
+                clip: true
+                boundsBehavior:Flickable.StopAtBounds
+                delegate: Loader{
+                    property var modelData : model
+                    property var name : model.name
+                    property var date : model.date
+                    property var isDecade: {
+                        return model.isDecade
+                    }
+                    sourceComponent: {
+                        if(model.type === 0){
+                            return com_week
+                        }
+                        if(model.type === 1){
+                            return com_day
+                        }
+                        if(model.type === 2){
+                            return com_month
+                        }
+                        if(model.type === 3){
+                            return com_year
+                        }
+                        return com_day
+                    }
+                }
+            }
+        }
+    }
+}

src/controls/FluCalenderView.qml

@@ -1,5 +0,0 @@
-import QtQuick 2.15
-
-Item {
-
-}

src/controls/FluCarousel.qml

@@ -0,0 +1,136 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+
+Item {
+
+    property bool flagXChanged: true
+    property int radius : 5
+    property int loopTime: 2000
+    property bool showIndicator: true
+
+    id:control
+    width: 400
+    height: 300
+    ListModel{
+        id:content_model
+    }
+    FluRectangle{
+        anchors.fill: parent
+        radius: [control.radius,control.radius,control.radius,control.radius]
+        FluShadow{
+            radius:control.radius
+        }
+        ListView{
+            id:list_view
+            anchors.fill: parent
+            snapMode: ListView.SnapOneItem
+            clip: true
+            boundsBehavior: ListView.StopAtBounds
+            model:content_model
+            maximumFlickVelocity: 4 * (list_view.orientation === Qt.Horizontal ? width : height)
+            preferredHighlightBegin: 0
+            preferredHighlightEnd: 0
+            highlightMoveDuration: 0
+            orientation : ListView.Horizontal
+            delegate: Item{
+                width: ListView.view.width
+                height: ListView.view.height
+                property int displayIndex: {
+                    if(index === 0)
+                        return content_model.count-3
+                    if(index === content_model.count-1)
+                        return 0
+                    return index-1
+                }
+                Image {
+                    anchors.fill: parent
+                    source: model.url
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+            onMovementEnded:{
+                currentIndex = list_view.contentX/list_view.width
+                if(currentIndex === 0){
+                    currentIndex = list_view.count-2
+                }else if(currentIndex === list_view.count-1){
+                    currentIndex = 1
+                }
+                flagXChanged = false
+                timer_run.start()
+            }
+            onMovementStarted: {
+                flagXChanged = true
+                timer_run.stop()
+            }
+            onContentXChanged: {
+                if(flagXChanged){
+                    var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
+                    var minY = Math.max(0,(list_view.width*(currentIndex-1)))
+                    if(contentX>=maxX){
+                        contentX = maxX
+                    }
+                    if(contentX<=minY){
+                        contentX = minY
+                    }
+                }
+            }
+        }
+    }
+    function setData(data){
+        content_model.clear()
+        content_model.append(data[data.length-1])
+        content_model.append(data)
+        content_model.append(data[0])
+        list_view.currentIndex = 1
+        timer_run.restart()
+    }
+    Row{
+        spacing: 10
+        anchors{
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            bottomMargin: 20
+        }
+        visible: showIndicator
+        Repeater{
+            model: list_view.count
+            Rectangle{
+                width: 8
+                height: 8
+                radius: 4
+                visible: {
+                    if(index===0 || index===list_view.count-1)
+                        return false
+                    return true
+                }
+                layer.samples: 4
+                layer.enabled: true
+                layer.smooth: true
+                border.width: 1
+                border.color: FluColors.Grey100
+                color:   list_view.currentIndex === index ?  FluTheme.primaryColor.dark : Qt.rgba(1,1,1,0.5)
+            }
+        }
+    }
+    Timer{
+        id:timer_anim
+        interval: 250
+        onTriggered: {
+            list_view.highlightMoveDuration = 0
+            if(list_view.currentIndex === list_view.count-1){
+                list_view.currentIndex = 1
+            }
+        }
+    }
+    Timer{
+        id:timer_run
+        interval: control.loopTime
+        repeat: true
+        onTriggered: {
+            list_view.highlightMoveDuration = 250
+            list_view.currentIndex = list_view.currentIndex+1
+            timer_anim.start()
+        }
+    }
+}

src/controls/FluColorPicker.qml

@@ -0,0 +1,52 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+
+Button{
+    id:control
+    width: 36
+    height: 36
+    implicitWidth: width
+    implicitHeight: height
+    background:
+        Rectangle{
+        id:layout_color
+        radius: 5
+        color: container.colorValue
+        border.color: {
+            if(hovered)
+                return FluTheme.primaryColor.light
+            return FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+        }
+        border.width: 1
+    }
+    contentItem: Item{}
+    onClicked: {
+        popup.showPopup()
+    }
+    Popup{
+        id:popup
+        height: container.height
+        width: container.width
+        background: FluColorView{
+            id:container
+        }
+        contentItem: Item{}
+        function showPopup() {
+            var pos = control.mapToItem(null, 0, 0)
+            if(window.height>pos.y+control.height+popup.height){
+                popup.y = control.height
+            } else if(pos.y>popup.height){
+                popup.y = -popup.height
+            } else {
+                popup.y = window.height-(pos.y+popup.height)
+            }
+            popup.x = -(popup.width-control.width)/2
+            popup.open()
+        }
+    }
+
+}

src/controls/FluColorView.qml

@@ -0,0 +1,29 @@
+import QtQuick 2.15
+import "../colorpicker"
+
+Item {
+
+    width: color_picker.width+10
+    height: color_picker.height
+
+    property alias colorValue: color_picker.colorValue
+
+    FluArea{
+        anchors.fill: parent
+        radius: 5
+
+        FluShadow{
+            radius: 5
+        }
+
+        ColorPicker{
+            id:color_picker
+        }
+    }
+
+    function setColor(color) {
+        color_picker.setColor(color)
+    }
+
+}
+

src/controls/FluDatePicker.qml

@@ -98,7 +98,11 @@ Rectangle {
 
     Popup{
         id:popup
+        width: container.width
+        height: container.height
+        contentItem: Item{}
         background: Rectangle{
+            id:container
             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)
@@ -202,9 +206,12 @@ Rectangle {
                     width: 100
                     height: parent.height
                     boundsBehavior:Flickable.StopAtBounds
-                    ScrollBar.vertical: ScrollBar { }
+                    ScrollBar.vertical: FluScrollBar {}
                     model: generateYearArray(1924,2048)
                     clip: true
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: 0
+                    highlightMoveDuration: 0
                     visible: showYear
                     delegate: Loader{
                         property var model: modelData
@@ -212,11 +219,6 @@ Rectangle {
                         property int position:index
                         sourceComponent: list_delegate
                     }
-                    onCurrentIndexChanged: {
-                        if(currentIndex!==-1){
-                            list_view_1.positionViewAtIndex(currentIndex, ListView.NoPosition)
-                        }
-                    }
                 }
                 Rectangle{
                     width: 1
@@ -228,7 +230,10 @@ Rectangle {
                     width: showYear ? 100 : 150
                     height: parent.height
                     clip: true
-                    ScrollBar.vertical: ScrollBar { }
+                    ScrollBar.vertical: FluScrollBar {}
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: 0
+                    highlightMoveDuration: 0
                     boundsBehavior:Flickable.StopAtBounds
                     delegate: Loader{
                         property var model: modelData
@@ -236,11 +241,6 @@ Rectangle {
                         property int position:index
                         sourceComponent: list_delegate
                     }
-                    onCurrentIndexChanged: {
-                        if(currentIndex!==-1){
-                            list_view_2.positionViewAtIndex(currentIndex, ListView.NoPosition)
-                        }
-                    }
                 }
                 Rectangle{
                     width: 1
@@ -252,7 +252,10 @@ Rectangle {
                     width:  showYear ? 100 : 150
                     height: parent.height
                     clip: true
-                    ScrollBar.vertical: ScrollBar { }
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: 0
+                    highlightMoveDuration: 0
+                    ScrollBar.vertical: FluScrollBar {}
                     Layout.alignment: Qt.AlignVCenter
                     boundsBehavior:Flickable.StopAtBounds
                     delegate: Loader{
@@ -261,9 +264,6 @@ Rectangle {
                         property int position:index
                         sourceComponent: list_delegate
                     }
-                    onCurrentIndexChanged: {
-                        list_view_3.positionViewAtIndex(currentIndex, ListView.NoPosition)
-                    }
                 }
             }
 
@@ -348,10 +348,12 @@ Rectangle {
             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)
+            if(window.height>pos.y+root.height+popup.height){
+                popup.y = root.height
+            } else if(pos.y>popup.height){
+                popup.y = -popup.height
+            } else {
+                popup.y = window.height-(pos.y+popup.height)
             }
             popup.open()
         }

src/controls/FluDropDownButton.qml

@@ -1,6 +1,89 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Window 2.15
 import FluentUI 1.0
 
-Item {
+Button {
+
+    property bool disabled: false
+    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)
+
+    id: control
+    topPadding:5
+    bottomPadding:5
+    leftPadding:15
+    rightPadding:35
+    enabled: !disabled
+    focusPolicy:Qt.TabFocus
+    property var window : Window.window
+
+    property alias items: menu.content
+
+    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 disableColor
+            }
+            return hovered ? hoverColor :normalColor
+        }
+        FluIcon{
+            iconSource:FluentIcons.ChevronDown
+            iconSize: 15
+            anchors{
+                right: parent.right
+                rightMargin: 10
+                verticalCenter: parent.verticalCenter
+            }
+            color:title.color
+        }
+
+    }
+    contentItem: FluText {
+        id:title
+        text: control.text
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        color: {
+            if(FluTheme.isDark){
+                if(disabled){
+                    return Qt.rgba(131/255,131/255,131/255,1)
+                }
+                return Qt.rgba(1,1,1,1)
+            }else{
+                if(disabled){
+                    return Qt.rgba(160/255,160/255,160/255,1)
+                }
+                return Qt.rgba(0,0,0,1)
+            }
+        }
+    }
+
+    onClicked: {
+        var pos = control.mapToItem(null, 0, 0)
+        if(window.height>pos.y+control.height+menu.height){
+            menu.y = control.height
+        }else if(pos.y>menu.height){
+            menu.y = -menu.height
+        }else{
+            popup.y = window.height-(pos.y+menu.height)
+        }
+        menu.open()
+    }
+
+    FluMenu{
+        id:menu
+        width: control.width
+    }
 
 }

src/controls/FluMenu.qml

@@ -1,16 +1,27 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
+import QtGraphicalEffects 1.15
 
-Popup {
+Menu {
     id: popup
-    default property alias content: container.children
+    default property alias content: container.data
 
-    background: Rectangle {
-        implicitWidth: 140
-        implicitHeight: container.height
-        color:FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(237/255,237/255,237/255,1)
-        radius: 5
+    width: 140
+    height: container.height
+
+    background: Item {
+
+        Rectangle{
+            anchors.fill: parent
+            color:FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
+            radius: 5
+            layer.enabled: true
+            layer.effect:  GaussianBlur {
+                radius: 8
+                samples: 16
+            }
+        }
 
         FluShadow{
             radius: 5
@@ -19,6 +30,7 @@ Popup {
             spacing: 5
             topPadding: 5
             bottomPadding: 5
+            width: popup.width
             id:container
             function closePopup(){
                 popup.close()

src/controls/FluMenuItem.qml

@@ -4,7 +4,12 @@ import QtQuick.Controls 2.15
 Item {
 
     id:root
-    width: 140
+    width: {
+        if(root.parent){
+            return root.parent.width
+        }
+        return 140
+    }
     height: 32
 
     property string text: "MenuItem"
@@ -12,14 +17,21 @@ Item {
 
     Rectangle{
         anchors.centerIn: parent
-        width: 100
+        width: root.width-40
         height: 32
         radius: 4
         color:{
-            if(mouse_area.containsMouse){
-                return FluTheme.isDark ? Qt.rgba(56/255,56/255,56/255,1) : Qt.rgba(230/255,230/255,230/255,1)
+            if(FluTheme.isDark){
+                if(mouse_area.containsMouse){
+                    return Qt.rgba(1,1,1,0.05)
+                }
+                return Qt.rgba(0,0,0,0)
+            }else{
+                if(mouse_area.containsMouse){
+                    return Qt.rgba(0,0,0,0.05)
+                }
+                return Qt.rgba(0,0,0,0)
             }
-            return FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(237/255,237/255,237/255,1)
         }
 
         FluText{

src/controls/FluMultiLineTextBox.qml

@@ -6,10 +6,17 @@ TextArea{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
+    property bool disabled: false
 
     id:input
     width: 300
-    color: FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+    color: {
+        if(disabled){
+            return FluTheme.isDark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+        }
+        return FluTheme.isDark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+    }
+    enabled: !disabled
     wrapMode: Text.WrapAnywhere
     renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     selectByMouse: true
@@ -24,6 +31,9 @@ TextArea{
         inputItem: input
     }
     placeholderTextColor: {
+        if(disabled){
+            return FluTheme.isDark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+        }
         if(focus){
             return FluTheme.isDark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
         }

src/controls/FluNavigationView.qml

@@ -16,6 +16,8 @@ Item {
 
     property bool displaMinimalNav : false
 
+    property alias actions: layout_actions.data
+
     onDisplayModeChanged: {
         if(displayMode === FluNavigationView.Minimal){
             anim_navi.enabled = false
@@ -135,12 +137,11 @@ Item {
         }
     }
 
-
     Item {
         id:nav_app_bar
         width: parent.width
         height: 38
-
+        z:999
         RowLayout{
             height:parent.height
             spacing: 0
@@ -173,22 +174,13 @@ Item {
 
 
         RowLayout{
+            id:layout_actions
             anchors{
                 right: parent.right
                 rightMargin: 14
                 verticalCenter: parent.verticalCenter
             }
             spacing: 5
-            FluText{
-                text:"夜间模式"
-                fontStyle: FluText.Body
-            }
-            FluToggleSwitch{
-                selected: FluTheme.isDark
-                clickFunc:function(){
-                    FluTheme.isDark = !FluTheme.isDark
-                }
-            }
         }
     }
 
@@ -232,7 +224,7 @@ Item {
         id:layout_list
         width: 300
         anchors{
-            top: nav_app_bar.bottom
+            top: parent.top
             bottom: parent.bottom
         }
         x: {
@@ -264,6 +256,7 @@ Item {
         Item{
             id:layout_header
             width: layout_list.width
+            y:nav_app_bar.height
             height: 50
 
             FluAutoSuggestBox{
@@ -322,6 +315,8 @@ Item {
                     stackIndex.push(currentIndex)
                 }
             }
+            ScrollBar.vertical: FluScrollBar {}
+
             model:{
                 if(items){
                     return items.children
@@ -375,11 +370,8 @@ Item {
                 }
             }
         }
-
     }
 
-
-
     function push(url){
         nav_swipe.push(url)
     }

src/controls/FluRadioButton.qml

@@ -32,7 +32,7 @@ Button {
                 if(selected&&disabled){
                     return 3
                 }
-                if(hovered){
+                if(pressed){
                     if(selected){
                         return 5
                     }
@@ -48,7 +48,7 @@ Button {
             }
             Behavior on border.width {
                 NumberAnimation{
-                    duration: 100
+                    duration: 150
                 }
             }
             border.color: {

src/controls/FluRectangle.qml

@@ -6,10 +6,8 @@ Item{
     id:root
     property var radius:[0,0,0,0]
     property color color : "#FFFFFF"
-    property color borderColor:"red"
-    property int borderWidth: 1
     property bool shadow: true
-    default property alias contentItem: container.children
+    default property alias contentItem: container.data
 
     Rectangle{
         id:container

src/controls/FluScrollablePage.qml

@@ -17,10 +17,13 @@ Item {
         fontStyle: FluText.TitleLarge
     }
 
-    ScrollView{
+    Flickable{
         clip: true
         width: parent.width
         contentWidth: parent.width
+        contentHeight: container.height
+        boundsBehavior: Flickable.StopAtBounds
+        ScrollBar.vertical: ScrollBar { }
         anchors{
             top: text_title.bottom
             bottom: parent.bottom

src/controls/FluShadow.qml

@@ -4,9 +4,9 @@ Item {
     id:root
     anchors.fill: parent
     anchors.margins: -4
-    property color color: FluTheme.isDark ? "#FFFFFF" : "#000000"
+    property color color: FluTheme.isDark ? "#FFFFFF" : "#999999"
 
-    property var radius: 4
+    property int radius: 4
 
     Rectangle{
         width: root.width

src/controls/FluTextBox.qml

@@ -6,10 +6,17 @@ TextField{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
+    property bool disabled: false
 
     id:input
     width: 300
-    color: FluTheme.isDark ? "#FFFFFF" : "#1A1A1A"
+    enabled: !disabled
+    color: {
+        if(disabled){
+            return FluTheme.isDark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+        }
+        return FluTheme.isDark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+    }
     renderType: FluTheme.isNativeText ? Text.NativeRendering : Text.QtRendering
     selectionColor: {
         if(FluTheme.isDark){
@@ -19,6 +26,9 @@ TextField{
         }
     }
     placeholderTextColor: {
+        if(disabled){
+            return FluTheme.isDark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+        }
         if(focus){
             return FluTheme.isDark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
         }

src/controls/FluTextBoxBackground.qml

@@ -9,10 +9,13 @@ Rectangle{
     radius: 4
     layer.enabled: true
     color: {
-        if(input.focus){
+        if(inputItem.disabled){
+            return FluTheme.isDark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1)
+        }
+        if(inputItem.focus){
             return FluTheme.isDark ? Qt.rgba(36/255,36/255,36/255,1) : Qt.rgba(1,1,1,1)
         }
-        if(input.hovered){
+        if(inputItem.hovered){
             return FluTheme.isDark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
         }
         return FluTheme.isDark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(1,1,1,1)
@@ -25,16 +28,22 @@ Rectangle{
         }
     }
     border.width: 1
-    border.color: FluTheme.isDark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(238/255,238/255,238/255,1)
+    border.color: {
+        if(inputItem.disabled){
+            return FluTheme.isDark ? Qt.rgba(73/255,73/255,73/255,1) : Qt.rgba(237/255,237/255,237/255,1)
+        }
+        return FluTheme.isDark ? Qt.rgba(76/255,76/255,76/255,1) : Qt.rgba(240/255,240/255,240/255,1)
+    }
     Rectangle{
         width: parent.width
-        height: input.focus ? 3 : 1
+        height: inputItem.focus ? 3 : 1
         anchors.bottom: parent.bottom
+        visible: !inputItem.disabled
         color: {
             if(FluTheme.isDark){
-                input.focus ? FluTheme.primaryColor.lighter  : Qt.rgba(166/255,166/255,166/255,1)
+                inputItem.focus ? FluTheme.primaryColor.lighter  : Qt.rgba(166/255,166/255,166/255,1)
             }else{
-                return input.focus ? FluTheme.primaryColor.dark  : Qt.rgba(183/255,183/255,183/255,1)
+                return inputItem.focus ? FluTheme.primaryColor.dark  : Qt.rgba(183/255,183/255,183/255,1)
             }
         }
         Behavior on height{

src/controls/FluTextButton.qml

@@ -1,22 +1,44 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
 import FluentUI 1.0
 
-FluText {
-    id:root
-    color: {
-        if(FluTheme.isDark){
-        return mouse_area.containsMouse?Qt.darker(FluTheme.primaryColor.lighter,1.1):FluTheme.primaryColor.lighter
+Button {
+
+    property bool disabled: false
+
+    property color normalColor: FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
+    property color hoverColor: FluTheme.isDark ? Qt.darker(normalColor,1.3) : Qt.lighter(normalColor,1.3)
+    property color disableColor: FluTheme.isDark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
+    property bool textBold: true
+
+    id: control
+    topPadding:5
+    bottomPadding:5
+    leftPadding:0
+    rightPadding:0
+    enabled: !disabled
+    focusPolicy:Qt.TabFocus
+
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+
+    background: Item{
+        FluFocusRectangle{
+            visible: control.visualFocus
+            radius:8
         }
-        return mouse_area.containsMouse?Qt.lighter(FluTheme.primaryColor.dark,1.1):FluTheme.primaryColor.dark
     }
-    signal clicked
-    MouseArea{
-        id:mouse_area
-        anchors.fill: parent
-        hoverEnabled: true
-        cursorShape: Qt.PointingHandCursor
-        onClicked: {
-            root.clicked()
+    contentItem: FluText {
+        text: control.text
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        font.bold: control.textBold
+        color: {
+            color:{
+                if(disabled){
+                    return disableColor
+                }
+                return hovered ? hoverColor :normalColor
+            }
         }
     }
 }

src/controls/FluTimePicker.qml

@@ -105,7 +105,11 @@ Rectangle {
 
     Popup{
         id:popup
+        width: container.width
+        height: container.height
+        contentItem: Item{}
         background: Rectangle{
+            id:container
             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)
@@ -201,7 +205,10 @@ Rectangle {
                     width: isH ? 100 : 150
                     height: parent.height
                     boundsBehavior:Flickable.StopAtBounds
-                    ScrollBar.vertical: ScrollBar { }
+                    ScrollBar.vertical: FluScrollBar {}
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: 0
+                    highlightMoveDuration: 0
                     model: isH ? generateArray(1,12) : generateArray(0,23)
                     clip: true
                     delegate: Loader{
@@ -210,9 +217,6 @@ Rectangle {
                         property int position:index
                         sourceComponent: list_delegate
                     }
-                    onCurrentIndexChanged: {
-                        list_view_1.positionViewAtIndex(currentIndex, ListView.NoPosition)
-                    }
                 }
                 Rectangle{
                     width: 1
@@ -225,7 +229,10 @@ Rectangle {
                     height: parent.height
                     model: generateArray(0,59)
                     clip: true
-                    ScrollBar.vertical: ScrollBar { }
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: 0
+                    highlightMoveDuration: 0
+                    ScrollBar.vertical: FluScrollBar {}
                     boundsBehavior:Flickable.StopAtBounds
                     delegate: Loader{
                         property var model: modelData
@@ -233,9 +240,6 @@ Rectangle {
                         property int position:index
                         sourceComponent: list_delegate
                     }
-                    onCurrentIndexChanged: {
-                        list_view_2.positionViewAtIndex(currentIndex, ListView.NoPosition)
-                    }
                 }
                 Rectangle{
                     width: 1
@@ -250,7 +254,10 @@ Rectangle {
                     model: ["上午","下午"]
                     clip: true
                     visible: isH
-                    ScrollBar.vertical: ScrollBar { }
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: 0
+                    highlightMoveDuration: 0
+                    ScrollBar.vertical: FluScrollBar {}
                     Layout.alignment: Qt.AlignVCenter
                     boundsBehavior:Flickable.StopAtBounds
                     delegate: Loader{
@@ -259,9 +266,6 @@ Rectangle {
                         property int position:index
                         sourceComponent: list_delegate
                     }
-                    onCurrentIndexChanged: {
-                        list_view_3.positionViewAtIndex(currentIndex, ListView.NoPosition)
-                    }
                 }
             }
 
@@ -358,10 +362,12 @@ Rectangle {
             }
 
             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)
+            if(window.height>pos.y+root.height+popup.height){
+                popup.y = root.height
+            } else if(pos.y>popup.height){
+                popup.y = -popup.height
+            } else {
+                popup.y = window.height-(pos.y+popup.height)
             }
             popup.open()
         }

src/controls/FluToggleSwitch.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.0
 import FluentUI 1.0
+import QtQuick.Layouts 1.15
 
 Button {
 
@@ -8,10 +9,8 @@ Button {
     property var clickFunc
 
     id: control
-    width: 40
-    implicitWidth: 40
     height: 20
-    implicitHeight: 20
+    implicitHeight: height
     focusPolicy:Qt.TabFocus
     Keys.onSpacePressed: control.visualFocus&&clicked()
     onClicked: {
@@ -21,47 +20,68 @@ Button {
         }
         selected = !selected
     }
-    background : Rectangle {
-        width: control.width
-        height: control.height
-        radius: height / 2
-        FluFocusRectangle{
-            visible: control.visualFocus
-            radius: 20
-        }
-        color: {
-            if(FluTheme.isDark){
-                if(selected){
-                    return FluTheme.primaryColor.dark
-                }
-                if(hovered){
-                    return "#3E3E3C"
-                }
-                return "#323232"
-            }else{
-                if(selected){
-                    return FluTheme.primaryColor.dark
-                }
-                if(hovered){
-                    return "#F4F4F4"
-                }
-                return  "#FFFFFF"
-            }
-        }
-        border.width: 1
-        border.color: selected ? Qt.lighter(FluTheme.primaryColor.dark,1.2) : "#666666"
+
+    contentItem: Item{}
+
+    background : RowLayout{
+        spacing: 0
         Rectangle {
-            x:  selected ? control.implicitWidth  - width - 4 : 4
-            width:  control.height - 8
-            height: control.height - 8
-            radius: width / 2
-            scale: hovered ? 1.2 : 1.0
-            anchors.verticalCenter: parent.verticalCenter
-            color: selected ? "#FFFFFF" : "#666666"
-            Behavior on x {
-                NumberAnimation { duration: 200 }
+            id:control_backgound
+            width: 40
+            height: control.height
+            radius: height / 2
+            smooth: true
+            antialiasing: true
+            FluFocusRectangle{
+                visible: control.visualFocus
+                radius: 20
+            }
+            color: {
+                if(FluTheme.isDark){
+                    if(selected){
+                        return FluTheme.primaryColor.dark
+                    }
+                    if(hovered){
+                        return "#3E3E3C"
+                    }
+                    return "#323232"
+                }else{
+                    if(selected){
+                        return FluTheme.primaryColor.dark
+                    }
+                    if(hovered){
+                        return "#F4F4F4"
+                    }
+                    return  "#FFFFFF"
+                }
+            }
+            border.width: 1
+            border.color: selected ? Qt.lighter(FluTheme.primaryColor.dark,1.2) : "#666666"
+            Rectangle {
+                x:  selected ? control_backgound.width  - width - 4 : 4
+                width:  control.height - 8
+                height: control.height - 8
+                radius: width / 2
+                antialiasing: true
+                scale: hovered ? 1.2 : 1.0
+                smooth: true
+                anchors.verticalCenter: parent.verticalCenter
+                color: selected ? "#FFFFFF" : "#666666"
+                Behavior on x {
+                    NumberAnimation { duration: 200 }
+                }
+                Behavior on scale {
+                    NumberAnimation { duration: 150 }
+                }
             }
         }
+
+        FluText{
+            text: control.text
+            Layout.leftMargin: 5
+            visible: text !== ""
+        }
+
     }
 
 }

src/controls/FluTreeView.qml

@@ -276,8 +276,8 @@ Item {
         model: tree_model
         flickableDirection: Flickable.HorizontalAndVerticalFlick
         clip: true
-        ScrollBar.vertical: ScrollBar { }
-        ScrollBar.horizontal: ScrollBar { }
+        ScrollBar.vertical: FluScrollBar {}
+        ScrollBar.horizontal: FluScrollBar { }
     }
 
     function updateData(items){

src/controls/FluWindow.qml

@@ -26,6 +26,11 @@ Item {
     property int maximumWidth
     property int minimumHeight
     property int maximumHeight
+    property int modality:0
+
+    signal initArgument(var argument)
+
+    property var pageRegister
 
     property int borderless:{
         if(!FluTheme.isFrameless){
@@ -76,8 +81,10 @@ Item {
         target: FluApp
         function onWindowReady(view){
             if(FluApp.equalsWindow(view,window)){
-                helper.initWindow(view);
-                helper.setTitle(title);
+                helper.initWindow(view)
+                initArgument(helper.getArgument())
+                pageRegister = helper.getPageRegister()
+                helper.setTitle(title)
                 if(minimumWidth){
                     helper.setMinimumWidth(minimumWidth)
                 }
@@ -90,6 +97,8 @@ Item {
                 if(maximumHeight){
                     helper.setMaximumHeight(maximumHeight)
                 }
+                helper.setModality(root.modality);
+                helper.updateWindow()
             }
         }
     }
@@ -106,17 +115,31 @@ Item {
     function showSuccess(text,duration,moremsg){
         infoBar.showSuccess(text,duration,moremsg);
     }
+
     function showInfo(text,duration,moremsg){
         infoBar.showInfo(text,duration,moremsg);
     }
+
     function showWarning(text,duration,moremsg){
         infoBar.showWarning(text,duration,moremsg);
     }
+
     function showError(text,duration,moremsg){
         infoBar.showError(text,duration,moremsg);
     }
+
     function close(){
         window.close()
     }
 
+    function registerForPageResult(path){
+        return helper.createRegister(path)
+    }
+
+    function onResult(data){
+        if(pageRegister){
+            pageRegister.onResult(data)
+        }
+    }
+
 }

src/res.qrc

@@ -44,8 +44,18 @@
         <file>controls/FluArea.qml</file>
         <file>res/font/Segoe_Fluent_Icons.ttf</file>
         <file>controls/FluDatePicker.qml</file>
-        <file>controls/FluCalenderView.qml</file>
-        <file>controls/FluCalendarDatePicker.qml</file>
+        <file>controls/FluCalendarView.qml</file>
+        <file>controls/FluCalendarPicker.qml</file>
         <file>controls/FluFocusRectangle.qml</file>
+        <file>controls/FluCarousel.qml</file>
+        <file>controls/FluBadge.qml</file>
+        <file>controls/FluColorView.qml</file>
+        <file>controls/FluColorPicker.qml</file>
+        <file>colorpicker/ColorPicker.qml</file>
+        <file>colorpicker/content/Checkerboard.qml</file>
+        <file>colorpicker/content/ColorSlider.qml</file>
+        <file>colorpicker/content/NumberBox.qml</file>
+        <file>colorpicker/content/PanelBorder.qml</file>
+        <file>colorpicker/content/SBPicker.qml</file>
     </qresource>
 </RCC>

src/win_install.bat

@@ -21,7 +21,7 @@ if %ANDROID% == YES copy /y %LIBFILE_PATH% %BUILDER_BIN_PATH%
 if %1 == SHARED (
     echo running install to qtqml folder
 	del /s /q %PRESET_PATH%\plugins.qmltypes
-	%QT_QML_FLUENT_PATH%\..\..\bin\qmlplugindump.exe -nonrelocatable FluentUI 1.0 .\ > %PRESET_PATH%\plugins.qmltypes
+	%QT_QML_FLUENT_PATH%\..\..\bin\qmlplugindump.exe -nonrelocatable FluentUI 1.0 > %PRESET_PATH%\plugins.qmltypes
     rmdir /s /q %QT_QML_FLUENT_PATH% & md %QT_QML_FLUENT_PATH%
     copy /y %BUILDER_BIN_PATH% %QT_QML_FLUENT_PATH%
 	xcopy %PRESET_PATH% %QT_QML_FLUENT_PATH% /s/e/i/y