update

Make the FluTableView readonly text copiable.

example/CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.20)
 project(example VERSION 0.1 LANGUAGES CXX)
 
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
@@ -20,10 +19,17 @@ endif()
 file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,6,0)
+add_definitions(-DVERSION=1,3,7,0)
 
 find_package(Qt6 REQUIRED COMPONENTS Quick)
-qt_standard_project_setup()
+
+if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
+    qt_standard_project_setup()
+else()
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOUIC ON)
+endif()
 
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
@@ -105,10 +111,3 @@ install(TARGETS example
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
-
-qt_generate_deploy_app_script(
-    TARGET example
-    OUTPUT_SCRIPT deploy_script
-    NO_UNSUPPORTED_PLATFORM_ERROR
-)
-install(SCRIPT ${deploy_script})

example/qml/App.qml

@@ -5,7 +5,8 @@ import QtQuick.Layouts
 import FluentUI
 
 Window {
-    id:app
+    id: app
+    flags: Qt.SplashScreen
     Component.onCompleted: {
         FluApp.init(app)
         FluTheme.darkMode = FluDarkMode.System

example/qml/page/T_DatePicker.qml

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

example/qml/page/T_Pivot.qml

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

example/qml/page/T_TableView.qml

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

example/qml/page/T_TimePicker.qml

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

example/qml/window/MainWindow.qml

@@ -112,6 +112,12 @@ CustomWindow {
             }
             Row{
                 z:8
+                anchors{
+                    top: parent.top
+                    left: parent.left
+                    topMargin: FluTools.isMacos() ? 20 : 5
+                    leftMargin: 5
+                }
                 FluIconButton{
                     iconSource: FluentIcons.ChromeBack
                     width: 30
@@ -134,6 +140,7 @@ CustomWindow {
 
             FluRemoteLoader{
                 id:loader
+                lazy: true
                 anchors.fill: parent
                 //                source: "http://localhost:9000/RemoteComponent.qml"
                 source: "https://zhu-zichu.gitee.io/RemoteComponent.qml"
@@ -233,12 +240,13 @@ CustomWindow {
             ctx.save()
             if(img_cache.source.toString().length!==0){
                 try{
-                    ctx.drawImage(img_cache, 0, 0,  canvasSize.width, canvasSize.height, 0, 0,  canvasSize.width, canvasSize.height)
+                    ctx.drawImage(img_cache.source, 0, 0,  canvasSize.width, canvasSize.height, 0, 0,  canvasSize.width, canvasSize.height)
                 }catch(e){
                     img_cache.source = ""
                 }
             }
             clearArc(ctx, centerX, centerY, radius)
+            canvas.unloadImage(img_cache.source)
             ctx.restore()
         }
         function clearArc(ctx,x, y, radius, startAngle, endAngle) {

src/CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.20)
 project(fluentuiplugin LANGUAGES CXX)
 
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
@@ -13,10 +12,17 @@ endif()
 set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,6,0)
+add_definitions(-DVERSION=1,3,7,0)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
-qt_standard_project_setup()
+
+if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
+    qt_standard_project_setup()
+else()
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOUIC ON)
+endif()
 
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
@@ -62,9 +68,9 @@ qt_add_qml_module(fluentuiplugin
 
 #链接库
 target_link_libraries(fluentuiplugin PUBLIC
-    Qt::Core
-    Qt::Quick
-    Qt::Qml
+    Qt::CorePrivate
+    Qt::QuickPrivate
+    Qt::QmlPrivate
 )
 
 #安装

src/FluApp.cpp

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

src/FluApp.h

@@ -73,6 +73,8 @@ public:
      */
     Q_INVOKABLE void closeApp();
 
+    Q_INVOKABLE void deleteWindow(QQuickWindow* window);
+
 public:
     /**
      * @brief wnds

src/FluTools.cpp

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

src/FluTools.h

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

src/WindowHelper.cpp

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

src/WindowHelper.h

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

src/imports/FluentUI/Controls/FluCalendarView.qml

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

src/imports/FluentUI/Controls/FluComboBox.qml

@@ -6,6 +6,7 @@ import QtQuick.Templates as T
 
 ComboBox {
     id: control
+    signal commit
     property bool disabled: false
     property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
@@ -44,6 +45,7 @@ ComboBox {
         bottomPadding: 6 - control.padding
         renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
         selectionColor: FluTheme.primaryColor.lightest
+        selectedTextColor: control.palette.highlightedText
         text: control.editable ? control.editText : control.displayText
         enabled: control.editable
         autoScroll: control.editable
@@ -57,12 +59,20 @@ ComboBox {
         leftInset:1
         topInset:1
         bottomInset:1
-        focus: true
         rightInset:1
         background: FluTextBoxBackground{
             border.width: 0
             inputItem: contentItem
         }
+        Component.onCompleted: {
+            forceActiveFocus()
+        }
+        Keys.onEnterPressed: {
+            control.commit()
+        }
+        Keys.onReturnPressed: {
+            control.commit()
+        }
     }
 
     background: Rectangle {

src/imports/FluentUI/Controls/FluCopyableText.qml

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

src/imports/FluentUI/Controls/FluDatePicker.qml

@@ -8,11 +8,9 @@ Rectangle {
     property color dividerColor: FluTheme.dark ? Qt.rgba(77/255,77/255,77/255,1) : Qt.rgba(239/255,239/255,239/255,1)
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
-    property var window : Window.window
     property bool showYear: true
-    property bool changeFlag: true
-    readonly property var rowData: ["","",""]
-    id:root
+    property var current
+    id:control
     color: {
         if(mouse_area.containsMouse){
             return hoverColor
@@ -24,6 +22,13 @@ Rectangle {
     radius: 4
     border.width: 1
     border.color: dividerColor
+    Item{
+        id:d
+        property var window: Window.window
+        property bool changeFlag: true
+        property var rowData: ["","",""]
+        visible: false
+    }
     MouseArea{
         id:mouse_area
         hoverEnabled: true
@@ -317,8 +322,19 @@ Rectangle {
                         }
                         text: "确定"
                         onClicked: {
-                            changeFlag = false
+                            d.changeFlag = false
                             popup.close()
+                            const year = text_year.text
+                            const month = text_month.text
+                            const day = text_day.text
+                            const date = new Date()
+                            date.setFullYear(parseInt(year));
+                            date.setMonth(parseInt(month) - 1);
+                            date.setDate(parseInt(day));
+                            date.setHours(0);
+                            date.setMinutes(0);
+                            date.setSeconds(0);
+                            current = date
                         }
                     }
                 }
@@ -326,10 +342,10 @@ Rectangle {
         }
         y:35
         function showPopup() {
-            changeFlag = true
-            rowData[0] = text_year.text
-            rowData[1] = text_month.text
-            rowData[2] = text_day.text
+            d.changeFlag = true
+            d.rowData[0] = text_year.text
+            d.rowData[1] = text_month.text
+            d.rowData[2] = text_day.text
             const now = new Date();
             var year = text_year.text === "年"? now.getFullYear() : Number(text_year.text);
             var month = text_month.text === "月"? now.getMonth() + 1 : Number(text_month.text);
@@ -342,21 +358,21 @@ Rectangle {
             list_view_3.model = generateMonthDaysArray(year,month)
             list_view_3.currentIndex = list_view_3.model.indexOf(day)
             text_day.text = day
-            var pos = root.mapToItem(null, 0, 0)
-            if(window.height>pos.y+root.height+container.height){
-                popup.y = root.height
+            var pos = control.mapToItem(null, 0, 0)
+            if(d.window.height>pos.y+control.height+container.height){
+                popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {
-                popup.y = window.height-(pos.y+container.height)
+                popup.y = d.window.height-(pos.y+container.height)
             }
             popup.open()
         }
         onClosed: {
-            if(changeFlag){
-                text_year.text = rowData[0]
-                text_month.text = rowData[1]
-                text_day.text = rowData[2]
+            if(d.changeFlag){
+                text_year.text = d.rowData[0]
+                text_month.text = d.rowData[1]
+                text_day.text = d.rowData[2]
             }
         }
     }

src/imports/FluentUI/Controls/FluMultilineTextBox.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls.Basic
 import FluentUI
 
 TextArea{
+    signal commit
     property bool disabled: false
     property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
     property color disableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
@@ -34,9 +35,17 @@ TextArea{
     }
     selectByMouse: true
     background: FluTextBoxBackground{ inputItem: control }
-    TapHandler {
+    Keys.onEnterPressed: {
+        control.commit()
+    }
+    Keys.onBackPressed: {
+        control.commit()
+    }
+    MouseArea{
+        anchors.fill: parent
+        cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: control.echoMode !== TextInput.Password && menu.popup()
     }
     FluTextBoxMenu{
         id:menu

src/imports/FluentUI/Controls/FluNavigationView.qml

@@ -31,7 +31,6 @@ Item {
     id:control
     QtObject{
         id:d
-        property var pageMap: ({})
         property var stackItems: []
         property int displayMode: FluNavigationView.Open
         property bool enableNavigationPanel: false
@@ -121,8 +120,7 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
+                    duration: 83
                 }
             }
         }
@@ -138,8 +136,7 @@ Item {
             }
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
+                    duration: 83
                 }
             }
             width: layout_list.width
@@ -330,8 +327,7 @@ Item {
         Item{
             Behavior on height {
                 NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
+                    duration: 83
                 }
             }
             clip: true
@@ -522,7 +518,7 @@ Item {
                 disabled:  nav_swipe.depth <= 1
                 iconSize: 13
                 onClicked: {
-                    nav_swipe.pop()
+                    FluTools.deleteItem(nav_swipe.pop())
                     d.stackItems.pop()
                     var item = d.stackItems[d.stackItems.length-1]
                     if(item.idx<(nav_list.count - layout_footer.count)){
@@ -685,7 +681,6 @@ Item {
             }
             return "transparent"
         }
-        clip: true
         x: visible ? 0 : -width
         Behavior on width {
             NumberAnimation{
@@ -955,7 +950,6 @@ Item {
                 radius: 4
             }
             color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
-
         }
         function showPopup(pos,model){
             control_popup.x = pos.x
@@ -1002,7 +996,7 @@ Item {
             case FluNavigationView.SingleTask:
                 while(nav_swipe.currentItem !== page)
                 {
-                    nav_swipe.pop()
+                    FluTools.deleteItem(nav_swipe.pop())
                     d.stackItems.pop()
                 }
                 return

src/imports/FluentUI/Controls/FluPasswordBox.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls.Basic
 import FluentUI
 
 TextField{
+    signal commit
     property bool disabled: false
     property int iconSource: 0
     property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
@@ -50,6 +51,12 @@ TextField{
             }
         }
     }
+    Keys.onEnterPressed: {
+        control.commit()
+    }
+    Keys.onBackPressed: {
+        control.commit()
+    }
     FluIconButton{
         id:btn_reveal
         iconSource:FluentIcons.RevealPasswordMedium
@@ -64,10 +71,6 @@ TextField{
             rightMargin: icon_end.visible ? 25 : 5
         }
     }
-    TapHandler {
-        acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
-    }
     FluTextBoxMenu{
         id:menu
         inputItem: control

src/imports/FluentUI/Controls/FluRemoteLoader.qml

@@ -4,15 +4,20 @@ import FluentUI
 
 FluStatusView {
     property url source: ""
+    property bool lazy: false
     color:"transparent"
     id:control
     onErrorClicked: {
         reload()
     }
+    Component.onCompleted: {
+        if(!lazy){
+            loader.source = control.source
+        }
+    }
     Loader{
         id:loader
         anchors.fill: parent
-        source: control.source
         asynchronous: true
         onStatusChanged: {
             if(status === Loader.Error){

src/imports/FluentUI/Controls/FluSlider.qml

@@ -42,27 +42,31 @@ T.Slider {
             }
         }
     }
+    background: Item {
+        x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2)
+        y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0)
+        implicitWidth: control.horizontal ? 180 : 6
+        implicitHeight: control.horizontal ? 6 : 180
+        width: control.horizontal ? control.availableWidth : implicitWidth
+        height: control.horizontal ? implicitHeight : control.availableHeight
+        Rectangle{
+            anchors.fill: parent
+            anchors.margins: 1
+            radius: 2
+            color:FluTheme.dark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
+        }
+        scale: control.horizontal && control.mirrored ? -1 : 1
+        Rectangle {
+            y: control.horizontal ? 0 : control.visualPosition * parent.height
+            width: control.horizontal ? control.position * parent.width : 6
+            height: control.horizontal ? 6 : control.position * parent.height
+            radius: 3
+            color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
+        }
+    }
     FluTooltip{
         parent: control.handle
         visible: control.tooltipEnabled && control.pressed
         text:String(control.value)
     }
-    background: Rectangle {
-        x: control.leftPadding + (control.horizontal ? 0 : (control.availableWidth - width) / 2)
-        y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0)
-        implicitWidth: control.horizontal ? 180 : 4
-        implicitHeight: control.horizontal ? 4 : 180
-        width: control.horizontal ? control.availableWidth : implicitWidth
-        height: control.horizontal ? implicitHeight : control.availableHeight
-        radius: 3
-        color:FluTheme.dark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
-        scale: control.horizontal && control.mirrored ? -1 : 1
-        Rectangle {
-            y: control.horizontal ? 0 : control.visualPosition * parent.height
-            width: control.horizontal ? control.position * parent.width : 4
-            height: control.horizontal ? 4 : control.position * parent.height
-            radius: 2
-            color:FluTheme.dark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
-        }
-    }
 }

src/imports/FluentUI/Controls/FluTableView.qml

@@ -15,14 +15,22 @@ Rectangle {
             var com_column = Qt.createComponent("FluTableModelColumn.qml")
             if (com_column.status === Component.Ready) {
                 var columns= []
+                var header_rows = {}
                 columnSource.forEach(function(item){
                     var column = com_column.createObject(table_model,{display:item.dataIndex});
                     columns.push(column)
+                    header_rows[item.dataIndex] = item.title
                 })
                 table_model.columns = columns
+                header_model.columns = columns
+                d.header_rows = [header_rows]
             }
         }
     }
+    QtObject{
+        id:d
+        property var header_rows:[]
+    }
     onDataSourceChanged: {
         table_model.clear()
         dataSource.forEach(function(item){
@@ -37,11 +45,28 @@ Rectangle {
         FluTextBox {
             anchors.fill: parent
             text: display
+            readOnly: true === columnSource[column].readOnly
             verticalAlignment: TextInput.AlignVCenter
-            Component.onCompleted: selectAll()
-            TableView.onCommit: {
-                display = text
+            Component.onCompleted: {
+                forceActiveFocus()
+                selectAll()
             }
+            onCommit: {
+                if(!readOnly){
+                    display = text
+                }
+                tableView.closeEditor()
+            }
+        }
+    }
+    Component{
+        id:com_text
+        FluText {
+            text: itemData
+            anchors.fill: parent
+            anchors.margins: 10
+            elide: Text.ElideRight
+            verticalAlignment: Text.AlignVCenter
         }
     }
     ScrollView{
@@ -60,55 +85,112 @@ Rectangle {
             boundsBehavior: Flickable.StopAtBounds
             ScrollBar.horizontal: FluScrollBar{}
             ScrollBar.vertical: FluScrollBar{}
-            selectionModel: ItemSelectionModel {}
+            selectionModel: ItemSelectionModel {
+                id:selection_model
+                model: table_model
+            }
             columnWidthProvider: function(column) {
-                let w = explicitColumnWidth(column)
-                if (w >= 0){
-                    var minimumWidth = columnSource[column].minimumWidth
-                    var maximumWidth = columnSource[column].maximumWidth
-                    if(!minimumWidth){
-                        minimumWidth = 100
-                    }
-                    if(!maximumWidth){
-                        maximumWidth = 65535
-                    }
-
-                    return Math.min(Math.max(minimumWidth, w),maximumWidth)
+                var w = columnSource[column].width
+                if(column === item_loader.column){
+                    item_loader.width = w
                 }
-                return implicitColumnWidth(column)
+                if(column === item_loader.column-1){
+                    let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
+                    if(cellItem){
+                        let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
+                        item_loader.x = table_view.contentX + cellPosition.x
+                    }
+                }
+                return w
             }
             rowHeightProvider: function(row) {
-                let h = explicitRowHeight(row)
-                if (h >= 0){
-                    return Math.max(40, h)
+                var h = table_model.getRow(row).height
+                if(row === item_loader.row){
+                    item_loader.height = h
                 }
-                return implicitRowHeight(row)
+                if(row === item_loader.row-1){
+                    let cellItem = table_view.itemAtCell(item_loader.column, item_loader.row)
+                    if(cellItem){
+                        let cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
+                        item_loader.y = table_view.contentY + cellPosition.y
+                    }
+                }
+                return h
             }
             model: table_model
             clip: true
             delegate: Rectangle {
+                id:item_table
+                property var position: Qt.point(column,row)
                 required property bool selected
-                required property bool current
+                property bool current: selection_model.currentIndex === table_model.index(row,column)
                 color: selected ? FluTheme.primaryColor.lightest: (row%2!==0) ? control.color : (FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06))
                 implicitHeight: 40
                 implicitWidth: columnSource[column].width
-                FluText {
-                    text: display
-                    anchors.fill: parent
-                    anchors.margins: 10
-                    elide: Text.ElideRight
-                    verticalAlignment: Text.AlignVCenter
-                }
-                TableView.editDelegate: {
-                    var obj =columnSource[column].editDelegate
-                    if(obj){
-                        return obj
+                TapHandler{
+                    acceptedButtons: Qt.LeftButton
+                    onDoubleTapped: {
+                        if(display instanceof Component){
+                            return
+                        }
+                        selection_model.setCurrentIndex(table_model.index(row,column), ItemSelectionModel.Current)
+                        item_loader.sourceComponent = obtEditDelegate(column,row)
+                        var index = table_model.index(row,column)
+                    }
+                    onTapped: {
+                        if(!current){
+                            item_loader.sourceComponent = null
+                        }
+                    }
+                }
+                Loader{
+                    property var itemData: display
+                    property var tableView: table_view
+                    property var tableModel: table_model
+                    property var position: item_table.position
+                    property int row: position.y
+                    property int column: position.x
+                    anchors.fill: parent
+                    sourceComponent: {
+                        if(itemData instanceof Component){
+                            return itemData
+                        }
+                        return com_text
                     }
-                    return com_edit
                 }
             }
         }
+        Loader{
+            id:item_loader
+            z:2
+            property var display
+            property int column
+            property int row
+            property var tableView: control
+            onDisplayChanged: {
+                table_model.setData(table_model.index(row,column),"display",display)
+            }
+        }
     }
+
+    function obtEditDelegate(column,row){
+        var display = table_model.data(table_model.index(row,column),"display")
+        var cellItem = table_view.itemAtCell(column, row)
+        var cellPosition = cellItem.mapToItem(scroll_table, 0, 0)
+        item_loader.column = column
+        item_loader.row = row
+        item_loader.x = table_view.contentX + cellPosition.x
+        item_loader.y = table_view.contentY + cellPosition.y
+        item_loader.width = table_view.columnWidthProvider(column)
+        item_loader.height = table_view.rowHeightProvider(row)
+        item_loader.display = display
+        var obj =columnSource[column].editDelegate
+        if(obj){
+            return obj
+        }
+        return com_edit
+    }
+
     Component{
         id:com_handle
         FluControl {
@@ -138,27 +220,166 @@ Rectangle {
         }
     }
     SelectionRectangle {
-        target: table_view
+        target: {
+            if(item_loader.sourceComponent){
+                return null
+            }
+            return table_view
+        }
         bottomRightHandle:com_handle
         topLeftHandle: com_handle
     }
-    FluHorizontalHeaderView {
+    TableView {
         id: header_horizontal
-        textRole: "title"
-        model: columnSource
+        model: TableModel{
+            id:header_model
+            rows: d.header_rows
+        }
+        syncDirection: Qt.Horizontal
         anchors.left: scroll_table.left
         anchors.top: parent.top
+        implicitWidth: syncView ? syncView.width : 0
+        implicitHeight: Math.max(1, contentHeight)
         syncView: table_view
         boundsBehavior: Flickable.StopAtBounds
         clip: true
+        delegate: Rectangle {
+            readonly property real cellPadding: 8
+            readonly property var obj : columnSource[column]
+            implicitWidth: column_text.implicitWidth + (cellPadding * 2)
+            implicitHeight: Math.max(header_horizontal.height, column_text.implicitHeight + (cellPadding * 2))
+            color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
+            border.color: FluTheme.dark ? "#252525" : "#e4e4e4"
+            FluText {
+                id: column_text
+                text: display
+                width: parent.width
+                height: parent.height
+                font.bold: true
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+            }
+            TapHandler{
+                onDoubleTapped: {
+                    selection_model.clear()
+                    for(var i=0;i<=table_view.rows;i++){
+                        selection_model.select(table_model.index(i,column),ItemSelectionModel.Select)
+                    }
+                }
+            }
+            MouseArea{
+                property point clickPos: "0,0"
+                height: parent.height
+                width: 4
+                anchors.right: parent.right
+                acceptedButtons: Qt.LeftButton
+                visible: !(obj.width === obj.minimumWidth && obj.width === obj.maximumWidth)
+                cursorShape: Qt.SplitHCursor
+                preventStealing: true
+                propagateComposedEvents: true
+                onPressed :
+                    (mouse)=>{
+                        FluTools.setOverrideCursor(Qt.SplitHCursor)
+                        clickPos = Qt.point(mouse.x, mouse.y)
+                    }
+                onReleased:{
+                    FluTools.restoreOverrideCursor()
+                }
+                onPositionChanged:
+                    (mouse)=>{
+                        var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y)
+                        var minimumWidth = obj.minimumWidth
+                        var maximumWidth = obj.maximumWidth
+                        if(!minimumWidth){
+                            minimumWidth = 100
+                        }
+                        if(!maximumWidth){
+                            maximumWidth = 65535
+                        }
+                        obj.width = Math.min(Math.max(minimumWidth, obj.width + delta.x),maximumWidth)
+                        table_view.forceLayout()
+                    }
+            }
+        }
     }
-    FluVerticalHeaderView {
+    TableView {
         id: header_vertical
         boundsBehavior: Flickable.StopAtBounds
         anchors.top: scroll_table.top
         anchors.left: parent.left
+        implicitWidth: Math.max(1, contentWidth)
+        implicitHeight: syncView ? syncView.height : 0
+        syncDirection: Qt.Vertical
         syncView: table_view
         clip: true
+        model: TableModel{
+            TableModelColumn {}
+            rows: {
+                if(dataSource)
+                    return dataSource
+                return []
+            }
+        }
+        delegate: Rectangle{
+            readonly property real cellPadding: 8
+            readonly property var obj : table_model.getRow(row)
+            implicitWidth: Math.max(header_vertical.width, row_text.implicitWidth + (cellPadding * 2))
+            implicitHeight: row_text.implicitHeight + (cellPadding * 2)
+            color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
+            border.color: FluTheme.dark ? "#252525" : "#e4e4e4"
+            FluText{
+                id:row_text
+                anchors.centerIn: parent
+                text: row + 1
+            }
+            TapHandler{
+                onDoubleTapped: {
+                    selection_model.clear()
+                    for(var i=0;i<=columnSource.length;i++){
+                        selection_model.select(table_model.index(row,i),ItemSelectionModel.Select)
+                    }
+                }
+            }
+            MouseArea{
+                property point clickPos: "0,0"
+                height: 4
+                width: parent.width
+                anchors.bottom: parent.bottom
+                acceptedButtons: Qt.LeftButton
+                cursorShape: Qt.SplitVCursor
+                preventStealing: true
+                visible: !(obj.height === obj.minimumHeight && obj.width === obj.maximumHeight)
+                propagateComposedEvents: true
+                onPressed :
+                    (mouse)=>{
+                        FluTools.setOverrideCursor(Qt.SplitVCursor)
+                        clickPos = Qt.point(mouse.x, mouse.y)
+                    }
+                onReleased:{
+                    FluTools.restoreOverrideCursor()
+                }
+                onPositionChanged:
+                    (mouse)=>{
+                        var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y)
+                        var minimumHeight = obj.minimumHeight
+                        var maximumHeight = obj.maximumHeight
+                        if(!minimumHeight){
+                            minimumHeight = 40
+                        }
+                        if(!maximumHeight){
+                            maximumHeight = 65535
+                        }
+                        obj.height = Math.min(Math.max(minimumHeight, obj.height + delta.y),maximumHeight)
+                        table_model.setRow(row,obj)
+                        table_view.forceLayout()
+                    }
+            }
+        }
+    }
+    function closeEditor(){
+        item_loader.sourceComponent = null
+    }
+    function resetPosition(){
+        table_view.positionViewAtCell(Qt.point(0, 0),Qt.AlignTop|Qt.AlignLeft)
     }
 }
-

src/imports/FluentUI/Controls/FluTextBox.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls.Basic
 import FluentUI
 
 TextField{
+    signal commit
     property bool disabled: false
     property int iconSource: 0
     property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
@@ -32,6 +33,12 @@ TextField{
         }
         return placeholderNormalColor
     }
+    Keys.onEnterPressed: {
+        control.commit()
+    }
+    Keys.onReturnPressed: {
+        control.commit()
+    }
     selectByMouse: true
     rightPadding: icon_end.visible ? 50 : 30
     background: FluTextBoxBackground{
@@ -49,13 +56,23 @@ TextField{
             }
         }
     }
+    MouseArea{
+        anchors.fill: parent
+        cursorShape: Qt.IBeamCursor
+        acceptedButtons: Qt.RightButton
+        onClicked: control.echoMode !== TextInput.Password && menu.popup()
+    }
     FluIconButton{
         iconSource:FluentIcons.ChromeClose
         iconSize: 10
         width: 20
         height: 20
         opacity: 0.5
-        visible: control.text !== ""
+        visible: {
+            if(control.readOnly)
+                return false
+            return control.text !== ""
+        }
         anchors{
             verticalCenter: parent.verticalCenter
             right: parent.right
@@ -65,10 +82,6 @@ TextField{
             control.text = ""
         }
     }
-    TapHandler {
-        acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
-    }
     FluTextBoxMenu{
         id:menu
         inputItem: control

src/imports/FluentUI/Controls/FluTextBoxMenu.qml

@@ -12,9 +12,7 @@ FluMenu{
     animEnabled: false
     width: 120
     onVisibleChanged: {
-        if(visible){
-            inputItem.forceActiveFocus()
-        }
+        inputItem.forceActiveFocus()
     }
     Connections{
         target: inputItem

src/imports/FluentUI/Controls/FluTimePicker.qml

@@ -12,10 +12,10 @@ Rectangle {
     property color dividerColor: FluTheme.dark ? Qt.rgba(77/255,77/255,77/255,1) : Qt.rgba(239/255,239/255,239/255,1)
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
-    property var window : Window.window
     property int hourFormat: FluTimePicker.H
     property int isH: hourFormat === FluTimePicker.H
-    id:root
+    property var current
+    id:control
     color: {
         if(mouse_area.containsMouse){
             return hoverColor
@@ -27,6 +27,13 @@ Rectangle {
     radius: 4
     border.width: 1
     border.color: dividerColor
+    Item{
+        id:d
+        property var window: Window.window
+        property bool changeFlag: true
+        property var rowData: ["","",""]
+        visible: false
+    }
     MouseArea{
         id:mouse_area
         hoverEnabled: true
@@ -312,8 +319,24 @@ Rectangle {
                         }
                         text: "确定"
                         onClicked: {
-                            changeFlag = false
+                            d.changeFlag = false
                             popup.close()
+                            const hours = text_hour.text
+                            const minutes = text_minute.text
+                            const period = text_ampm.text
+                            const date = new Date()
+                            var hours24 = parseInt(hours);
+                            if(control.hourFormat === FluTimePicker.H){
+                                if (hours === "12") {
+                                    hours24 = (period === "上午") ? 0 : 12;
+                                } else {
+                                    hours24 = (period === "上午") ? hours24 : hours24 + 12;
+                                }
+                            }
+                            date.setHours(hours24);
+                            date.setMinutes(parseInt(minutes));
+                            date.setSeconds(0);
+                            current = date
                         }
                     }
                 }
@@ -321,10 +344,10 @@ Rectangle {
         }
         y:35
         function showPopup() {
-            changeFlag = true
-            rowData[0] = text_hour.text
-            rowData[1] = text_minute.text
-            rowData[2] = text_ampm.text
+            d.changeFlag = true
+            d.rowData[0] = text_hour.text
+            d.rowData[1] = text_minute.text
+            d.rowData[2] = text_ampm.text
 
             var now = new Date();
 
@@ -353,27 +376,24 @@ Rectangle {
             if(isH){
                 text_ampm.text = ampm
             }
-
-            var pos = root.mapToItem(null, 0, 0)
-            if(window.height>pos.y+root.height+container.height){
-                popup.y = root.height
+            var pos = control.mapToItem(null, 0, 0)
+            if(d.window.height>pos.y+control.height+container.height){
+                popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {
-                popup.y = window.height-(pos.y+container.height)
+                popup.y = d.window.height-(pos.y+container.height)
             }
             popup.open()
         }
         onClosed: {
-            if(changeFlag){
-                text_hour.text = rowData[0]
-                text_minute.text = rowData[1]
-                text_ampm.text = rowData[2]
+            if(d.changeFlag){
+                text_hour.text = d.rowData[0]
+                text_minute.text = d.rowData[1]
+                text_ampm.text = d.rowData[2]
             }
         }
     }
-    property bool changeFlag: true
-    readonly property var rowData: ["","",""]
     function generateArray(start, n) {
         var arr = [];
         for (var i = start; i <= n; i++) {

src/imports/FluentUI/Controls/FluWindow.qml

@@ -44,11 +44,6 @@ Window {
         id: bg
         anchors.fill: parent
         color: backgroundColor
-        Behavior on color{
-            ColorAnimation {
-                duration: 300
-            }
-        }
     }
     Item{
         id:container
@@ -78,7 +73,7 @@ Window {
         return helper.createRegister(window,path)
     }
     function deleteWindow(){
-        helper.deleteWindow()
+        FluApp.deleteWindow(window)
     }
     function onResult(data){
         if(pageRegister){