Merge pull request #488 from yanhuacuo/path-for-insertRow

Add the functionality to insert new rows into the table

example/example_en_US.ts

@@ -1968,7 +1968,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="478"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,57 +1988,67 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="337"/>
+        <location filename="qml/page/T_TableView.qml" line="358"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="412"/>
+        <location filename="qml/page/T_TableView.qml" line="433"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="473"/>
+        <location filename="qml/page/T_TableView.qml" line="470"/>
+        <source>Insert a Row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="478"/>
+        <source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="508"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="491"/>
+        <location filename="qml/page/T_TableView.qml" line="526"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="498"/>
+        <location filename="qml/page/T_TableView.qml" line="534"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="505"/>
+        <location filename="qml/page/T_TableView.qml" line="541"/>
         <source>Long String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="513"/>
+        <location filename="qml/page/T_TableView.qml" line="549"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="532"/>
+        <location filename="qml/page/T_TableView.qml" line="568"/>
         <source>&lt;Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="533"/>
+        <location filename="qml/page/T_TableView.qml" line="569"/>
         <source>Next&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="419"/>
+        <location filename="qml/page/T_TableView.qml" line="440"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="443"/>
+        <location filename="qml/page/T_TableView.qml" line="464"/>
         <source>Add a row of Data</source>
         <translation type="unfinished"></translation>
     </message>

example/example_zh_CN.ts

@@ -2110,7 +2110,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="478"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -2130,57 +2130,67 @@ Some contents...</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="337"/>
+        <location filename="qml/page/T_TableView.qml" line="358"/>
         <source>Age</source>
         <translation type="unfinished">年龄</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="412"/>
+        <location filename="qml/page/T_TableView.qml" line="433"/>
         <source>Clear All</source>
         <translation type="unfinished">清除所有</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="473"/>
+        <location filename="qml/page/T_TableView.qml" line="470"/>
+        <source>Insert a Row</source>
+        <translation type="unfinished">插入一行</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="478"/>
+        <source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
+        <translation type="unfinished">焦点未获取：请点击表格中的任意一项，作为插入的靶点！</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="508"/>
         <source>Avatar</source>
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="491"/>
+        <location filename="qml/page/T_TableView.qml" line="526"/>
         <source>Address</source>
         <translation type="unfinished">地址</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="498"/>
+        <location filename="qml/page/T_TableView.qml" line="534"/>
         <source>Nickname</source>
         <translation type="unfinished">昵称</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="505"/>
+        <location filename="qml/page/T_TableView.qml" line="541"/>
         <source>Long String</source>
         <translation type="unfinished">长字符串</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="513"/>
+        <location filename="qml/page/T_TableView.qml" line="549"/>
         <source>Options</source>
         <translation type="unfinished">操作</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="532"/>
+        <location filename="qml/page/T_TableView.qml" line="568"/>
         <source>&lt;Previous</source>
         <translation type="unfinished">&lt;上一页</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="533"/>
+        <location filename="qml/page/T_TableView.qml" line="569"/>
         <source>Next&gt;</source>
         <translation type="unfinished">下一页&gt;</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="419"/>
+        <location filename="qml/page/T_TableView.qml" line="440"/>
         <source>Delete Selection</source>
         <translation type="unfinished">删除选中</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="443"/>
+        <location filename="qml/page/T_TableView.qml" line="464"/>
         <source>Add a row of Data</source>
         <translation type="unfinished">添加一行数据</translation>
     </message>

example/qml/page/T_TableView.qml

@@ -13,7 +13,7 @@ FluContentPage{
 
     property var dataSource : []
     property int sortType: 0
-    property bool seletedAll: true
+    property bool selectedAll: true
     property string nameKeyword: ""
 
     onNameKeywordChanged: {
@@ -32,11 +32,11 @@ FluContentPage{
     onCheckBoxChanged: {
         for(var i =0;i< table_view.rows ;i++){
             if(false === table_view.getRow(i).checkbox.options.checked){
-                root.seletedAll = false
+                root.selectedAll = false
                 return
             }
         }
-        root.seletedAll = true
+        root.selectedAll = true
     }
 
     onSortTypeChanged: {
@@ -238,12 +238,12 @@ FluContentPage{
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluCheckBox{
-                    checked: true === root.seletedAll
+                    checked: true === root.selectedAll
                     animationEnabled: false
                     Layout.alignment: Qt.AlignVCenter
                     clickListener: function(){
-                        root.seletedAll = !root.seletedAll
+                        root.selectedAll = !root.selectedAll
-                        var checked = root.seletedAll
+                        var checked = root.selectedAll
                         itemModel.display = table_view.customItem(com_column_checbox,{"checked":checked})
                         for(var i =0;i< table_view.rows ;i++){
                             var rowData = table_view.getRow(i)
@@ -280,6 +280,27 @@ FluContentPage{
         }
     }
 
+    Component{
+        id:com_auto_suggestbox
+        FluAutoSuggestBox {
+            id: textbox
+            anchors.fill: parent
+            focus: true
+            Component.onCompleted: {
+                var data = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
+                var result = data.map(function(item) {
+                    return {title: item};
+                });
+                items = result
+                textbox.text= String(display)
+            }
+            onCommit: {
+                editTextChaged(textbox.text)
+                tableView.closeEditor()
+            }
+        }
+    }
+
     Component{
         id:com_avatar
         Item{
@@ -445,6 +466,20 @@ FluContentPage{
                     table_view.appendRow(genTestObject())
                 }
             }
+            FluButton{
+                text: qsTr("Insert a Row")
+                onClicked: {
+                    if(typeof table_view.current !== 'undefined'){
+                        var newLine = genTestObject()
+                        var currentLine = dataSource.findIndex(obj => obj._key === table_view.current._key)
+                        root.dataSource.splice(currentLine, 0, newLine);
+                        table_view.dataSource = root.dataSource
+                    }else{
+                        showWarning(qsTr("Focus not acquired: Please click any item in the form as the target for insertion!"))
+                    }
+
+                }
+            }
 
         }
     }
@@ -490,6 +525,7 @@ FluContentPage{
             {
                 title: qsTr("Address"),
                 dataIndex: 'address',
+                editDelegate: com_auto_suggestbox,
                 width:200,
                 minimumWidth:100,
                 maximumWidth:250
@@ -566,7 +602,7 @@ FluContentPage{
             return avatars[randomIndex];
         }
         return {
-            checkbox: table_view.customItem(com_checbox,{checked:root.seletedAll}),
+            checkbox: table_view.customItem(com_checbox,{checked:root.selectedAll}),
             avatar:table_view.customItem(com_avatar,{avatar:getAvatar()}),
             name: getRandomName(),
             age:getRandomAge(),
@@ -579,7 +615,7 @@ FluContentPage{
         }
     }
     function loadData(page,count){
-        root.seletedAll = true
+        root.selectedAll = true
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push(genTestObject())

example/qml/window/MainWindow.qml

@@ -15,7 +15,7 @@ FluWindow {
     title: "FluentUI"
     width: 1000
     height: 680
-    minimumWidth: 1000
+    minimumWidth: 680
     minimumHeight: 200
     launchMode: FluWindowType.SingleTask
     fitsAppBarWindows: true

src/FluFrameless.cpp

@@ -141,7 +141,6 @@ void FluFrameless::componentComplete() {
     const auto uMsg = msg->message;
     const auto wParam = msg->wParam;
     const auto lParam = msg->lParam;
-    static QPoint offsetXY;
     if (uMsg == WM_WINDOWPOSCHANGING) {
         auto *wp = reinterpret_cast<WINDOWPOS *>(lParam);
         if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0) {
@@ -163,10 +162,6 @@ void FluFrameless::componentComplete() {
         }
         int offsetSize;
         bool isMaximum = ::IsZoomed(hwnd);
-        auto _offsetXY = QPoint(abs(clientRect->left - originalLeft), abs(clientRect->top - originalTop));
-        if (_offsetXY.x() != 0) {
-            offsetXY = _offsetXY;
-        }
         if (isMaximum || _isFullScreen()) {
             offsetSize = 0;
         } else {
@@ -175,19 +170,10 @@ void FluFrameless::componentComplete() {
         if (!isCompositionEnabled()) {
             offsetSize = 0;
         }
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         clientRect->top = originalTop + offsetSize;
         clientRect->bottom = originalBottom - offsetSize;
         clientRect->left = originalLeft + offsetSize;
         clientRect->right = originalRight - offsetSize;
-#else
-        if (!isMaximum) {
-            clientRect->top = originalTop + offsetSize;
-            clientRect->bottom = originalBottom - offsetSize;
-            clientRect->left = originalLeft + offsetSize;
-            clientRect->right = originalRight - offsetSize;
-        }
-#endif
         _setMaximizeHovered(false);
         *result = WVR_REDRAW;
         return true;
@@ -266,27 +252,15 @@ void FluFrameless::componentComplete() {
         return true;
     } else if (uMsg == WM_GETMINMAXINFO) {
         auto *minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        minmaxInfo->ptMaxPosition.x = 0;
-        minmaxInfo->ptMaxPosition.y = 0;
-        minmaxInfo->ptMaxSize.x = 0;
-        minmaxInfo->ptMaxSize.y = 0;
-        return false;
-#else
         auto pixelRatio = window()->devicePixelRatio();
         auto geometry = window()->screen()->availableGeometry();
         RECT rect;
         SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
-        if (!_fixSize) {
+        minmaxInfo->ptMaxPosition.x = rect.left;
-            minmaxInfo->ptMinTrackSize.x = qRound(window()->minimumWidth() * pixelRatio + offsetXY.x());
+        minmaxInfo->ptMaxPosition.y = rect.top;
-            minmaxInfo->ptMinTrackSize.y = qRound(window()->minimumHeight() * pixelRatio + offsetXY.y() + _appbar->height() * pixelRatio);
+        minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio);
-        }
+        minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio);
-        minmaxInfo->ptMaxPosition.x = rect.left - offsetXY.x();
+        return false;
-        minmaxInfo->ptMaxPosition.y = rect.top - offsetXY.x();
-        minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio) + offsetXY.x() * 2;
-        minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio) + offsetXY.y() * 2;
-        return true;
-#endif
     } else if (uMsg == WM_NCRBUTTONDOWN) {
         if (wParam == HTCAPTION) {
             _showSystemMenu(QCursor::pos());

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

@@ -7,6 +7,7 @@ FluTextBox{
     property var items:[]
     property string emptyText: qsTr("No results found")
     property int autoSuggestBoxReplacement: FluentIcons.Search
+    property string textRole: "title"
     property var filter: function(item){
         if(item.title.indexOf(control.text)!==-1){
             return true
@@ -25,7 +26,7 @@ FluTextBox{
         function handleClick(modelData){
             control_popup.visible = false
             control.itemClicked(modelData)
-            control.updateText(modelData.title)
+            control.updateText(modelData[textRole])
         }
         function loadData(){
             var result = []
@@ -48,7 +49,6 @@ FluTextBox{
     }
     Popup{
         id:control_popup
-        y:control.height
         focus: false
         padding: 0
         enter: Transition {
@@ -103,7 +103,7 @@ FluTextBox{
                         }
                     }
                     contentItem: FluText{
-                        text:modelData.title
+                        text: modelData[textRole]
                         leftPadding: 10
                         rightPadding: 10
                         verticalAlignment : Qt.AlignVCenter
@@ -128,7 +128,7 @@ FluTextBox{
         if(d.flagVisible){
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+rect_background.implicitHeight){
-                control_popup.y = control.height
+                control_popup.y = Qt.binding(function(){return control.height})
             } else if(pos.y>rect_background.implicitHeight){
                 control_popup.y = -rect_background.implicitHeight
             } else {

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

@@ -3,8 +3,10 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
+
 Item {
     signal requestPage(int page, int count)
+
     property string previousText: qsTr("<Previous")
     property string nextText: qsTr("Next>")
     property int pageCurrent: 0
@@ -13,6 +15,8 @@ Item {
     property int pageCount: itemCount > 0 ? Math.ceil(itemCount / __itemPerPage) : 0
     property int __itemPerPage: 10
     property int __pageButtonHalf: Math.floor(pageButtonCount / 2) + 1
+    property Component header: null
+    property Component footer: null
     id: control
     implicitHeight: 40
     implicitWidth: content.width
@@ -21,6 +25,9 @@ Item {
         height: control.height
         spacing: 10
         padding: 10
+        Loader {
+            sourceComponent: header
+        }
         FluToggleButton {
             visible: control.pageCount > 1
             disabled: control.pageCurrent <= 1
@@ -31,6 +38,7 @@ Item {
         }
         Row {
             spacing: 5
+
             FluToggleButton {
                 property int pageNumber: 1
                 visible: control.pageCount > 0
@@ -86,9 +94,12 @@ Item {
                 control.calcNewPage(control.pageCurrent + 1);
             }
         }
+        Loader {
+            sourceComponent: footer
         }
-    function calcNewPage(page)
+    }
-    {
+
+    function calcNewPage(page) {
         if (!page)
             return
         let page_num = Number(page)
@@ -97,4 +108,5 @@ Item {
         control.pageCurrent = page_num
         control.requestPage(page_num, control.__itemPerPage)
     }
+
 }

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

@@ -196,6 +196,11 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
+            TableView.onPooled: {
+                if(d.editPosition && d.editPosition.row === row && d.editPosition.column === column){
+                    control.closeEditor()
+                }
+            }
             property var rowObject : control.getRow(row)
             property var itemModel: model
             property bool editVisible: {
@@ -274,9 +279,9 @@ Rectangle {
                         if(typeof(display) == "object"){
                             return
                         }
+                        loader_edit.display = display
                         d.editDelegate = d.getEditDelegate(column)
                         updateEditPosition()
-                        loader_edit.display = display
                     }
                     onClicked:
                         (event)=>{

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

@@ -6,6 +6,7 @@ FluTextBox{
     property var items:[]
     property string emptyText: qsTr("No results found")
     property int autoSuggestBoxReplacement: FluentIcons.Search
+    property string textRole: "title"
     property var filter: function(item){
         if(item.title.indexOf(control.text)!==-1){
             return true
@@ -24,7 +25,7 @@ FluTextBox{
         function handleClick(modelData){
             control_popup.visible = false
             control.itemClicked(modelData)
-            control.updateText(modelData.title)
+            control.updateText(modelData[textRole])
         }
         function loadData(){
             var result = []
@@ -47,7 +48,6 @@ FluTextBox{
     }
     Popup{
         id:control_popup
-        y:control.height
         focus: false
         padding: 0
         enter: Transition {
@@ -102,7 +102,7 @@ FluTextBox{
                         }
                     }
                     contentItem: FluText{
-                        text:modelData.title
+                        text: modelData[textRole]
                         leftPadding: 10
                         rightPadding: 10
                         verticalAlignment : Qt.AlignVCenter
@@ -127,7 +127,7 @@ FluTextBox{
         if(d.flagVisible){
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+rect_background.implicitHeight){
-                control_popup.y = control.height
+                control_popup.y = Qt.binding(function(){return control.height})
             } else if(pos.y>rect_background.implicitHeight){
                 control_popup.y = -rect_background.implicitHeight
             } else {

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

@@ -1,10 +1,11 @@
-import QtQuick
+import QtQuick 2.15
-import QtQuick.Controls
+import QtQuick.Controls 2.15
-import QtQuick.Layouts
+import QtQuick.Layouts 1.15
-import FluentUI
+import FluentUI 1.0
 
 Item {
     signal requestPage(int page, int count)
+
     property string previousText: qsTr("<Previous")
     property string nextText: qsTr("Next>")
     property int pageCurrent: 0
@@ -13,6 +14,8 @@ Item {
     property int pageCount: itemCount > 0 ? Math.ceil(itemCount / __itemPerPage) : 0
     property int __itemPerPage: 10
     property int __pageButtonHalf: Math.floor(pageButtonCount / 2) + 1
+    property Component header: null
+    property Component footer: null
     id: control
     implicitHeight: 40
     implicitWidth: content.width
@@ -21,6 +24,9 @@ Item {
         height: control.height
         spacing: 10
         padding: 10
+        Loader {
+            sourceComponent: header
+        }
         FluToggleButton {
             visible: control.pageCount > 1
             disabled: control.pageCurrent <= 1
@@ -31,6 +37,7 @@ Item {
         }
         Row {
             spacing: 5
+
             FluToggleButton {
                 property int pageNumber: 1
                 visible: control.pageCount > 0
@@ -86,9 +93,12 @@ Item {
                 control.calcNewPage(control.pageCurrent + 1);
             }
         }
+        Loader {
+            sourceComponent: footer
         }
-    function calcNewPage(page)
+    }
-    {
+
+    function calcNewPage(page) {
         if (!page)
             return
         let page_num = Number(page)
@@ -97,4 +107,5 @@ Item {
         control.pageCurrent = page_num
         control.requestPage(page_num, control.__itemPerPage)
     }
+
 }

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

@@ -56,7 +56,9 @@ QtObject {
             var launchMode = win.launchMode
             if(launchMode === 1){
                 win.argument = argument
-                win.show()
+                if(!win.visible){
+                    win.visible = true
+                }
                 win.raise()
                 win.requestActivate()
                 return

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

@@ -196,6 +196,11 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
+            TableView.onPooled: {
+                if(d.editPosition && d.editPosition.row === row && d.editPosition.column === column){
+                    control.closeEditor()
+                }
+            }
             property var rowObject : control.getRow(row)
             property var itemModel: model
             property bool editVisible: {
@@ -274,9 +279,9 @@ Rectangle {
                         if(typeof(display) == "object"){
                             return
                         }
+                        loader_edit.display = display
                         d.editDelegate = d.getEditDelegate(column)
                         updateEditPosition()
-                        loader_edit.display = display
                     }
                     onClicked:
                         (event)=>{