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

Add the functionality to insert new rows into the table
Merge pull request #489 from w-jt/main
2024-11-22 19:00:07 +08:00 · 2024-04-28 10:47:28 +08:00 · 2024-04-28 10:46:47 +08:00 · 2024-04-27 11:54:42 +08:00 · 2024-04-27 11:53:57 +08:00 · 2024-04-27 11:49:29 +08:00
5 changed files with 281 additions and 224 deletions
--- a/example/example_en_US.ts
+++ b/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="499"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
        <source>Name</source>
        <translation type="unfinished"></translation>
    </message>
@ -1998,37 +1998,47 @@ Some contents...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TableView.qml" line="494"/>
+        <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="512"/>
+        <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="520"/>
+        <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="527"/>
+        <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="535"/>
+        <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="554"/>
+        <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="555"/>
+        <location filename="qml/page/T_TableView.qml" line="569"/>
        <source>Next&gt;</source>
        <translation type="unfinished"></translation>
    </message>
--- a/example/example_zh_CN.ts
+++ b/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="499"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
        <source>Name</source>
        <translation type="unfinished">名称</translation>
    </message>
@ -2140,37 +2140,47 @@ Some contents...</source>
        <translation type="unfinished">清除所有</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TableView.qml" line="494"/>
+        <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="512"/>
+        <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="520"/>
+        <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="527"/>
+        <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="535"/>
+        <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="554"/>
+        <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="555"/>
+        <location filename="qml/page/T_TableView.qml" line="569"/>
        <source>Next&gt;</source>
        <translation type="unfinished">下一页&gt;</translation>
    </message>
--- a/example/qml/page/T_TableView.qml
+++ b/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
-                        var checked = root.seletedAll
+                        root.selectedAll = !root.selectedAll
+                        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)
@ -466,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!"))
+                    }
+
+                }
+            }

        }
    }
@ -588,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(),
@ -601,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())
--- a/src/Qt5/imports/FluentUI/Controls/FluPagination.qml
+++ b/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)
    }
+
 }
--- a/src/Qt6/imports/FluentUI/Controls/FluPagination.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPagination.qml
@ -1,10 +1,11 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import FluentUI
+import QtQuick 2.15
+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 +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)
    }
+
 }
Author	SHA1	Message	Date
zhuzichu	2d4e61445e	Merge pull request #488 from yanhuacuo/path-for-insertRow Add the functionality to insert new rows into the table	2024-04-28 10:47:28 +08:00
zhuzichu	cc79854191	Merge pull request #489 from w-jt/main FluPagination.qml 添加自定义控件，通过header和footer属性添加控件	2024-04-28 10:46:47 +08:00
w-jt	500efa6298	添加自定义控件，通过header和footer属性添加控件添加自定义控件，通过header和footer属性添加控件	2024-04-27 11:54:42 +08:00
w-jt	355332da96	添加自定义控件，通过header和footer属性添加控件添加自定义控件，通过header和footer属性添加控件	2024-04-27 11:53:57 +08:00
w-jt	a0d662a8a5	添加自定义控件，通过header和footer属性添加控件添加自定义控件，通过header和footer属性添加控件	2024-04-27 11:49:29 +08:00
w-jt	aecc3fe3b4	添加自定义控件，通过header和footer属性添加控件添加自定义控件，通过header和footer属性添加控件	2024-04-27 11:48:19 +08:00
wubixiaozhu	3554fb99cd	Add the functionality to insert new rows into the table	2024-04-27 09:40:37 +08:00