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="513"/>
+        <location filename="qml/page/T_TableView.qml" line="499"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1998,47 +1998,37 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <location filename="qml/page/T_TableView.qml" line="494"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="526"/>
+        <location filename="qml/page/T_TableView.qml" line="512"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="534"/>
+        <location filename="qml/page/T_TableView.qml" line="520"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="541"/>
+        <location filename="qml/page/T_TableView.qml" line="527"/>
         <source>Long String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="549"/>
+        <location filename="qml/page/T_TableView.qml" line="535"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="568"/>
+        <location filename="qml/page/T_TableView.qml" line="554"/>
         <source>&lt;Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="569"/>
+        <location filename="qml/page/T_TableView.qml" line="555"/>
         <source>Next&gt;</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="513"/>
+        <location filename="qml/page/T_TableView.qml" line="499"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -2140,47 +2140,37 @@ Some contents...</source>
         <translation type="unfinished">清除所有</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="qml/page/T_TableView.qml" line="494"/>
         <source>Avatar</source>
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="526"/>
+        <location filename="qml/page/T_TableView.qml" line="512"/>
         <source>Address</source>
         <translation type="unfinished">地址</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="534"/>
+        <location filename="qml/page/T_TableView.qml" line="520"/>
         <source>Nickname</source>
         <translation type="unfinished">昵称</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="541"/>
+        <location filename="qml/page/T_TableView.qml" line="527"/>
         <source>Long String</source>
         <translation type="unfinished">长字符串</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="549"/>
+        <location filename="qml/page/T_TableView.qml" line="535"/>
         <source>Options</source>
         <translation type="unfinished">操作</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="568"/>
+        <location filename="qml/page/T_TableView.qml" line="554"/>
         <source>&lt;Previous</source>
         <translation type="unfinished">&lt;上一页</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="569"/>
+        <location filename="qml/page/T_TableView.qml" line="555"/>
         <source>Next&gt;</source>
         <translation type="unfinished">下一页&gt;</translation>
     </message>

example/qml/page/T_TableView.qml

@@ -13,7 +13,7 @@ FluContentPage{
 
     property var dataSource : []
     property int sortType: 0
-    property bool selectedAll: true
+    property bool seletedAll: 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.selectedAll = false
+                root.seletedAll = false
                 return
             }
         }
-        root.selectedAll = true
+        root.seletedAll = true
     }
 
     onSortTypeChanged: {
@@ -238,12 +238,12 @@ FluContentPage{
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluCheckBox{
-                    checked: true === root.selectedAll
+                    checked: true === root.seletedAll
                     animationEnabled: false
                     Layout.alignment: Qt.AlignVCenter
                     clickListener: function(){
-                        root.selectedAll = !root.selectedAll
-                        var checked = root.selectedAll
+                        root.seletedAll = !root.seletedAll
+                        var checked = root.seletedAll
                         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,20 +466,6 @@ 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!"))
-                    }
-
-                }
-            }
 
         }
     }
@@ -602,7 +588,7 @@ FluContentPage{
             return avatars[randomIndex];
         }
         return {
-            checkbox: table_view.customItem(com_checbox,{checked:root.selectedAll}),
+            checkbox: table_view.customItem(com_checbox,{checked:root.seletedAll}),
             avatar:table_view.customItem(com_avatar,{avatar:getAvatar()}),
             name: getRandomName(),
             age:getRandomAge(),
@@ -615,7 +601,7 @@ FluContentPage{
         }
     }
     function loadData(page,count){
-        root.selectedAll = true
+        root.seletedAll = true
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push(genTestObject())

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

@@ -3,10 +3,8 @@ 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
@@ -15,8 +13,6 @@ 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
@@ -25,9 +21,6 @@ Item {
         height: control.height
         spacing: 10
         padding: 10
-        Loader {
-            sourceComponent: header
-        }
         FluToggleButton{
             visible: control.pageCount>1
             disabled: control.pageCurrent<=1
@@ -38,7 +31,6 @@ Item {
         }
         Row{
             spacing: 5
-
             FluToggleButton{
                 property int pageNumber:1
                 visible: control.pageCount>0
@@ -94,12 +86,9 @@ Item {
                 control.calcNewPage(control.pageCurrent+1);
             }
         }
-        Loader {
-            sourceComponent: footer
     }
-    }
-
-    function calcNewPage(page) {
+    function calcNewPage(page)
+    {
         if(!page)
             return
         let page_num=Number(page)
@@ -108,5 +97,4 @@ Item {
         control.pageCurrent=page_num
         control.requestPage(page_num,control.__itemPerPage)
     }
-
 }

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

@@ -1,11 +1,10 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
 
 Item {
     signal requestPage(int page,int count)
-
     property string previousText: qsTr("<Previous")
     property string nextText: qsTr("Next>")
     property int pageCurrent: 0
@@ -14,8 +13,6 @@ 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
@@ -24,9 +21,6 @@ Item {
         height: control.height
         spacing: 10
         padding: 10
-        Loader {
-            sourceComponent: header
-        }
         FluToggleButton{
             visible: control.pageCount>1
             disabled: control.pageCurrent<=1
@@ -37,7 +31,6 @@ Item {
         }
         Row{
             spacing: 5
-
             FluToggleButton{
                 property int pageNumber:1
                 visible: control.pageCount>0
@@ -93,12 +86,9 @@ Item {
                 control.calcNewPage(control.pageCurrent+1);
             }
         }
-        Loader {
-            sourceComponent: footer
     }
-    }
-
-    function calcNewPage(page) {
+    function calcNewPage(page)
+    {
         if(!page)
             return
         let page_num=Number(page)
@@ -107,5 +97,4 @@ Item {
         control.pageCurrent=page_num
         control.requestPage(page_num,control.__itemPerPage)
     }
-
 }