example/qml-Qt6/page/T_TableView.qml

@@ -261,16 +261,16 @@ FluContentPage{
         FluComboBox {
             anchors.fill: parent
             focus: true
-            editText: display
+            currentIndex: display
             editable: true
             model: ListModel {
-                ListElement { text: "100" }
+                ListElement { text: 100 }
-                ListElement { text: "300" }
+                ListElement { text: 300 }
-                ListElement { text: "500" }
+                ListElement { text: 500 }
-                ListElement { text: "1000" }
+                ListElement { text: 1000 }
             }
             Component.onCompleted: {
-                currentIndex=["100","300","500","1000"].findIndex((element) => element === display)
+                currentIndex=[100,300,500,1000].findIndex((element) => element === Number(display))
                 selectAll()
             }
             onCommit: {

example/qml/page/T_TableView.qml

@@ -261,16 +261,16 @@ FluContentPage{
         FluComboBox {
             anchors.fill: parent
             focus: true
-            editText: display
+            currentIndex: display
             editable: true
             model: ListModel {
-                ListElement { text: "100" }
+                ListElement { text: 100 }
-                ListElement { text: "300" }
+                ListElement { text: 300 }
-                ListElement { text: "500" }
+                ListElement { text: 500 }
-                ListElement { text: "1000" }
+                ListElement { text: 1000 }
             }
             Component.onCompleted: {
-                currentIndex=["100","300","500","1000"].findIndex((element) => element === display)
+                currentIndex=[100,300,500,1000].findIndex((element) => element === Number(display))
                 selectAll()
             }
             onCommit: {

example/src/helper/Log.cpp

@@ -207,3 +207,8 @@ void Log::setup(const QString &app,int level)
     qInfo()<<"[LOG_PATH]"<<g_file_path;
     qInfo()<<"===================================================";
 }
+
+void Log::teardown()
+{
+    qInstallMessageHandler(0);
+}

example/src/helper/Log.h

@@ -6,6 +6,7 @@ namespace Log
 {
     QString prettyProductInfoWrapper();
     void setup(const QString &app,int level = 4);
+    void teardown();
 }
 
 #endif // LOG_H

example/src/main.cpp

@@ -82,5 +82,6 @@ int main(int argc, char *argv[])
     if (exec == 931) {
         QProcess::startDetached(qApp->applicationFilePath(), QStringList());
     }
+    Log::teardown();
     return exec;
 }

src/Qt5/imports/FluentUI/Controls/FluTableView.qml

@@ -177,12 +177,15 @@ Rectangle {
         onCanceled: {
             d.rowHoverIndex = -1
         }
+        ScrollView{
+            anchors.fill: parent
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+            ScrollBar.vertical.policy: ScrollBar.AlwaysOff
             TableView {
                 id:table_view
                 ListModel{
                     id:model_columns
                 }
-            anchors.fill: parent
                 boundsBehavior: Flickable.StopAtBounds
                 syncView: header_horizontal
                 syncDirection: Qt.Horizontal
@@ -207,53 +210,23 @@ Rectangle {
                     closeEditor()
                 }
                 delegate: MouseArea{
-                id:item_table_mouse
                     property var rowObject : control.getRow(row)
                     property var itemModel: model
-                property bool editVisible: {
-                    if(d.editPosition === undefined){
-                        return false
-                    }
-                    if(d.editPosition._key === rowObject._key && d.editPosition.column === column){
-                        return true
-                    }
-                    return false
-                }
                     hoverEnabled: true
+                    implicitHeight: 40
+                    implicitWidth: {
+                        var w = columnSource[column].width
+                        if(!w){
+                            w = columnSource[column].minimumWidth
+                        }
+                        if(!w){
+                            w = d.defaultItemWidth
+                        }
+                        return w
+                    }
                     onEntered: {
                         d.rowHoverIndex = row
                     }
-                onWidthChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                onHeightChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                onXChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                onYChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                function updateEditPosition(){
-                    var obj = {}
-                    obj._key = rowObject._key
-                    obj.column = column
-                    obj.row = row
-                    obj.x = item_table_mouse.x
-                    obj.y = item_table_mouse.y + 1
-                    obj.width = item_table_mouse.width
-                    obj.height = item_table_mouse.height - 2
-                    d.editPosition = obj
-                }
                     Rectangle{
                         id:item_table
                         anchors.fill: parent
@@ -290,8 +263,7 @@ Rectangle {
                                     return
                                 }
                                 d.editDelegate = d.getEditDelegate(column)
-                            updateEditPosition()
+                                d.editPosition = {"_key":rowObject._key,"column":column}
-                            loader_edit.display = display
                             }
                             onClicked:
                                 (event)=>{
@@ -319,6 +291,29 @@ Rectangle {
                                 return com_text
                             }
                         }
+                        FluLoader{
+                            property var display: itemModel.display
+                            property int column: item_table.position.x
+                            property int row: item_table.position.y
+                            property var tableView: control
+                            signal editTextChaged(string text)
+                            anchors.fill: parent
+                            onEditTextChaged:
+                                (text)=>{
+                                    var obj = control.getRow(row)
+                                    obj[columnSource[column].dataIndex] = text
+                                    control.setRow(row,obj)
+                                }
+                            sourceComponent: {
+                                if(d.editPosition === undefined){
+                                    return undefined
+                                }
+                                if(d.editPosition._key === rowObject._key && d.editPosition.column === column){
+                                    return d.editDelegate
+                                }
+                                return undefined
+                            }
+                        }
                         Item{
                             anchors.fill: parent
                             visible: item_table.isRowSelected
@@ -351,58 +346,7 @@ Rectangle {
                         }
                     }
                 }
-
-            FluLoader{
-                id:loader_edit
-                property var tableView: control
-                property var display
-                property int column: {
-                    if(d.editPosition){
-                        return d.editPosition.column
             }
-                    return 0
-                }
-                property int row: {
-                    if(d.editPosition){
-                        return d.editPosition.row
-                    }
-                    return 0
-                }
-                signal editTextChaged(string text)
-                sourceComponent: d.editPosition ? d.editDelegate : undefined
-                onEditTextChaged:
-                    (text)=>{
-                        var obj = control.getRow(row)
-                        obj[columnSource[column].dataIndex] = text
-                        control.setRow(row,obj)
-                    }
-                width: {
-                    if(d.editPosition){
-                        return d.editPosition.width
-                    }
-                    return 0
-                }
-                height: {
-                    if(d.editPosition){
-                        return d.editPosition.height
-                    }
-                    return 0
-                }
-                x:{
-                    if(d.editPosition){
-                        return d.editPosition.x
-                    }
-                    return 0
-                }
-                y:{
-                    if(d.editPosition){
-                        return d.editPosition.y
-                    }
-                    return 0
-                }
-                z:999
-            }
-
         }
     }
     Component{
@@ -549,16 +493,18 @@ Rectangle {
                 hoverEnabled: true
                 visible: !(columnObject.width === columnObject.minimumWidth && columnObject.width === columnObject.maximumWidth && columnObject.width)
                 cursorShape: Qt.SplitHCursor
-                preventStealing: true
                 onPressed :
                     (mouse)=>{
+                        header_horizontal.interactive = false
                         FluTools.setOverrideCursor(Qt.SplitHCursor)
                         clickPos = Qt.point(mouse.x, mouse.y)
                     }
                 onReleased:{
+                    header_horizontal.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onCanceled: {
+                    header_horizontal.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onPositionChanged:
@@ -683,7 +629,6 @@ Rectangle {
                 anchors.bottom: parent.bottom
                 acceptedButtons: Qt.LeftButton
                 cursorShape: Qt.SplitVCursor
-                preventStealing: true
                 visible: {
                     if(rowObject === null)
                         return false
@@ -691,13 +636,16 @@ Rectangle {
                 }
                 onPressed :
                     (mouse)=>{
+                        header_vertical.interactive = false
                         FluTools.setOverrideCursor(Qt.SplitVCursor)
                         clickPos = Qt.point(mouse.x, mouse.y)
                     }
                 onReleased:{
+                    header_vertical.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onCanceled: {
+                    header_vertical.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onPositionChanged:

src/Qt6/imports/FluentUI/Controls/FluTableView.qml

@@ -178,12 +178,15 @@ Rectangle {
         onCanceled: {
             d.rowHoverIndex = -1
         }
+        ScrollView{
+            anchors.fill: parent
+            ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+            ScrollBar.vertical.policy: ScrollBar.AlwaysOff
             TableView {
                 id:table_view
                 ListModel{
                     id:model_columns
                 }
-            anchors.fill: parent
                 boundsBehavior: Flickable.StopAtBounds
                 syncView: header_horizontal
                 syncDirection: Qt.Horizontal
@@ -208,53 +211,23 @@ Rectangle {
                     closeEditor()
                 }
                 delegate: MouseArea{
-                id:item_table_mouse
                     property var rowObject : control.getRow(row)
                     property var itemModel: model
-                property bool editVisible: {
-                    if(d.editPosition === undefined){
-                        return false
-                    }
-                    if(d.editPosition._key === rowObject._key && d.editPosition.column === column){
-                        return true
-                    }
-                    return false
-                }
                     hoverEnabled: true
+                    implicitHeight: 40
+                    implicitWidth: {
+                        var w = columnSource[column].width
+                        if(!w){
+                            w = columnSource[column].minimumWidth
+                        }
+                        if(!w){
+                            w = d.defaultItemWidth
+                        }
+                        return w
+                    }
                     onEntered: {
                         d.rowHoverIndex = row
                     }
-                onWidthChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                onHeightChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                onXChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                onYChanged: {
-                    if(editVisible){
-                        updateEditPosition()
-                    }
-                }
-                function updateEditPosition(){
-                    var obj = {}
-                    obj._key = rowObject._key
-                    obj.column = column
-                    obj.row = row
-                    obj.x = item_table_mouse.x
-                    obj.y = item_table_mouse.y + 1
-                    obj.width = item_table_mouse.width
-                    obj.height = item_table_mouse.height - 2
-                    d.editPosition = obj
-                }
                     Rectangle{
                         id:item_table
                         anchors.fill: parent
@@ -291,8 +264,7 @@ Rectangle {
                                     return
                                 }
                                 d.editDelegate = d.getEditDelegate(column)
-                            updateEditPosition()
+                                d.editPosition = {"_key":rowObject._key,"column":column}
-                            loader_edit.display = display
                             }
                             onClicked:
                                 (event)=>{
@@ -320,6 +292,29 @@ Rectangle {
                                 return com_text
                             }
                         }
+                        FluLoader{
+                            property var display: itemModel.display
+                            property int column: item_table.position.x
+                            property int row: item_table.position.y
+                            property var tableView: control
+                            signal editTextChaged(string text)
+                            anchors.fill: parent
+                            onEditTextChaged:
+                                (text)=>{
+                                    var obj = control.getRow(row)
+                                    obj[columnSource[column].dataIndex] = text
+                                    control.setRow(row,obj)
+                                }
+                            sourceComponent: {
+                                if(d.editPosition === undefined){
+                                    return undefined
+                                }
+                                if(d.editPosition._key === rowObject._key && d.editPosition.column === column){
+                                    return d.editDelegate
+                                }
+                                return undefined
+                            }
+                        }
                         Item{
                             anchors.fill: parent
                             visible: item_table.isRowSelected
@@ -352,58 +347,7 @@ Rectangle {
                         }
                     }
                 }
-
-            FluLoader{
-                id:loader_edit
-                property var tableView: control
-                property var display
-                property int column: {
-                    if(d.editPosition){
-                        return d.editPosition.column
             }
-                    return 0
-                }
-                property int row: {
-                    if(d.editPosition){
-                        return d.editPosition.row
-                    }
-                    return 0
-                }
-                signal editTextChaged(string text)
-                sourceComponent: d.editPosition ? d.editDelegate : undefined
-                onEditTextChaged:
-                    (text)=>{
-                        var obj = control.getRow(row)
-                        obj[columnSource[column].dataIndex] = text
-                        control.setRow(row,obj)
-                    }
-                width: {
-                    if(d.editPosition){
-                        return d.editPosition.width
-                    }
-                    return 0
-                }
-                height: {
-                    if(d.editPosition){
-                        return d.editPosition.height
-                    }
-                    return 0
-                }
-                x:{
-                    if(d.editPosition){
-                        return d.editPosition.x
-                    }
-                    return 0
-                }
-                y:{
-                    if(d.editPosition){
-                        return d.editPosition.y
-                    }
-                    return 0
-                }
-                z:999
-            }
-
         }
     }
     Component{
@@ -550,16 +494,18 @@ Rectangle {
                 hoverEnabled: true
                 visible: !(columnObject.width === columnObject.minimumWidth && columnObject.width === columnObject.maximumWidth && columnObject.width)
                 cursorShape: Qt.SplitHCursor
-                preventStealing: true
                 onPressed :
                     (mouse)=>{
+                        header_horizontal.interactive = false
                         FluTools.setOverrideCursor(Qt.SplitHCursor)
                         clickPos = Qt.point(mouse.x, mouse.y)
                     }
                 onReleased:{
+                    header_horizontal.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onCanceled: {
+                    header_horizontal.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onPositionChanged:
@@ -684,7 +630,6 @@ Rectangle {
                 anchors.bottom: parent.bottom
                 acceptedButtons: Qt.LeftButton
                 cursorShape: Qt.SplitVCursor
-                preventStealing: true
                 visible: {
                     if(rowObject === null)
                         return false
@@ -692,13 +637,16 @@ Rectangle {
                 }
                 onPressed :
                     (mouse)=>{
+                        header_vertical.interactive = false
                         FluTools.setOverrideCursor(Qt.SplitVCursor)
                         clickPos = Qt.point(mouse.x, mouse.y)
                     }
                 onReleased:{
+                    header_vertical.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onCanceled: {
+                    header_vertical.interactive = true
                     FluTools.restoreOverrideCursor()
                 }
                 onPositionChanged: