From 94f8047508358dc116ae9c76f0c9205ed76f483c Mon Sep 17 00:00:00 2001
From: zhuzihcu <zhuzichu520@gmail.com>
Date: Wed, 14 Jun 2023 19:29:23 +0800
Subject: [PATCH] update

---
 example/qml/global/ItemsOriginal.qml          |  6 ++
 example/qml/page/T_ComboBox.qml               |  4 -
 example/qml/page/T_TableView.qml              | 86 +++++++++++++++----
 example/qml/page/T_TableView2.qml             | 80 +++++++++++++++++
 .../FluentUI/Controls/FluCopyableText.qml     |  3 +
 .../FluentUI/Controls/FluScrollIndicator.qml  | 49 +++++++++++
 .../FluentUI/Controls/FluTableModelColumn.qml |  5 ++
 .../FluentUI/Controls/FluTableView.qml        | 30 +++----
 .../FluentUI/Controls/FluTableView2.qml       | 84 ++++++++++++++++++
 9 files changed, 310 insertions(+), 37 deletions(-)
 create mode 100644 example/qml/page/T_TableView2.qml
 create mode 100644 src/imports/FluentUI/Controls/FluScrollIndicator.qml
 create mode 100644 src/imports/FluentUI/Controls/FluTableModelColumn.qml
 create mode 100644 src/imports/FluentUI/Controls/FluTableView2.qml

diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml
index 7f0b15f3..b9c9fb3c 100644
--- a/example/qml/global/ItemsOriginal.qml
+++ b/example/qml/global/ItemsOriginal.qml
@@ -252,6 +252,12 @@ FluObject{
                 navigationView.push("qrc:/example/qml/page/T_TableView.qml")
             }
         }
+        FluPaneItem{
+            title:"TableView2"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_TableView2.qml")
+            }
+        }
         FluPaneItem{
             title:"MultiWindow"
             onTap:{
diff --git a/example/qml/page/T_ComboBox.qml b/example/qml/page/T_ComboBox.qml
index 22d7092d..d8b1f448 100644
--- a/example/qml/page/T_ComboBox.qml
+++ b/example/qml/page/T_ComboBox.qml
@@ -28,10 +28,6 @@ FluScrollablePage{
                     ListElement { text: "Apple" }
                     ListElement { text: "Coconut" }
                 }
-                onAccepted: {
-                    if (find(editText) === -1)
-                        model_1.append({text: editText})
-                }
             }
         }
     }
diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml
index e11a50aa..f24cac13 100644
--- a/example/qml/page/T_TableView.qml
+++ b/example/qml/page/T_TableView.qml
@@ -14,12 +14,14 @@ FluScrollablePage{
                           {
                               title: '姓名',
                               dataIndex: 'name',
-                              width:100
+                              width:100,
+
                           },
                           {
                               title: '年龄',
-                              dataIndex: 'age',
-                              width:100
+                              dataIndex: 'item_age',
+                              width:100,
+                              minimumWidth:100
                           },
                           {
                               title: '住址',
@@ -41,17 +43,30 @@ FluScrollablePage{
         loadData(1,10)
     }
 
-    FluTableView{
-        id:table_view
-        Layout.fillWidth: true
-        Layout.topMargin: 20
-        pageCurrent:1
-        pageCount:10
-        itemCount: 1000
-        onRequestPage:
-            (page,count)=> {
-                loadData(page,count)
+    Component{
+        id:com_age
+        Item{
+            id:item_age
+            property var ageArr: [100,300,500,1000]
+            height: 60
+            FluComboBox{
+                width: 80
+                anchors{
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: 10
+                }
+                model: ListModel {
+                    ListElement { text: 100 }
+                    ListElement { text: 300 }
+                    ListElement { text: 500 }
+                    ListElement { text: 1000 }
+                }
+                Component.onCompleted: {
+                    currentIndex=ageArr.findIndex((element) => element === dataModel.age)
+                }
             }
+        }
     }
 
     Component{
@@ -65,7 +80,7 @@ FluScrollablePage{
                     text:"编辑"
                     horizontalPadding: 6
                     onClicked:{
-                        showSuccess(JSON.stringify(dataObject))
+                        showError(JSON.stringify(dataObject))
                     }
                 }
                 FluFilledButton{
@@ -79,6 +94,20 @@ FluScrollablePage{
         }
     }
 
+
+    FluTableView{
+        id:table_view
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        pageCurrent:1
+        pageCount:10
+        itemCount: 1000
+        onRequestPage:
+            (page,count)=> {
+                loadData(page,count)
+            }
+    }
+
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: 10
@@ -131,13 +160,34 @@ FluScrollablePage{
     }
 
     function loadData(page,count){
+        var numbers = [100, 300, 500, 1000];
+        function getRandomAge() {
+            var randomIndex = Math.floor(Math.random() * numbers.length);
+            return numbers[randomIndex];
+        }
+        var names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"];
+        function getRandomName(){
+            var randomIndex = Math.floor(Math.random() * names.length);
+            return names[randomIndex];
+        }
+        var nicknames = ["复海大圣","混天大圣","移山大圣","通风大圣","驱神大圣","齐天大圣","平天大圣"]
+        function getRandomNickname(){
+            var randomIndex = Math.floor(Math.random() * nicknames.length);
+            return nicknames[randomIndex];
+        }
+        var addresses = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
+        function getRandomAddresses(){
+            var randomIndex = Math.floor(Math.random() * addresses.length);
+            return addresses[randomIndex];
+        }
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push({
-                                name: "孙悟空%1".arg(((page-1)*count+i)),
-                                age: 500,
-                                address: "钟灵毓秀的花果山,如神仙仙境的水帘洞",
-                                nickname: "齐天大圣",
+                                name: getRandomName(),
+                                item_age: com_age,
+                                age:getRandomAge(),
+                                address: getRandomAddresses(),
+                                nickname: getRandomNickname(),
                                 action:com_action
                             })
         }
diff --git a/example/qml/page/T_TableView2.qml b/example/qml/page/T_TableView2.qml
new file mode 100644
index 00000000..f95655d5
--- /dev/null
+++ b/example/qml/page/T_TableView2.qml
@@ -0,0 +1,80 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluContentPage{
+
+    title:"TableView"
+
+    Component.onCompleted: {
+        loadData(1,10)
+    }
+
+    function loadData(page,count){
+        var numbers = [100, 300, 500, 1000];
+        function getRandomAge() {
+            var randomIndex = Math.floor(Math.random() * numbers.length);
+            return numbers[randomIndex];
+        }
+        var names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"];
+        function getRandomName(){
+            var randomIndex = Math.floor(Math.random() * names.length);
+            return names[randomIndex];
+        }
+        var nicknames = ["复海大圣","混天大圣","移山大圣","通风大圣","驱神大圣","齐天大圣","平天大圣"]
+        function getRandomNickname(){
+            var randomIndex = Math.floor(Math.random() * nicknames.length);
+            return nicknames[randomIndex];
+        }
+        var addresses = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
+        function getRandomAddresses(){
+            var randomIndex = Math.floor(Math.random() * addresses.length);
+            return addresses[randomIndex];
+        }
+        const dataSource = []
+        for(var i=0;i<count;i++){
+            dataSource.push({
+                                name: getRandomName(),
+                                age:getRandomAge(),
+                                address: getRandomAddresses(),
+                                nickname: getRandomNickname()
+                            })
+        }
+        table_view.dataSource = dataSource
+    }
+
+    FluTableView2{
+        id:table_view
+        anchors.fill: parent
+        anchors.topMargin: 20
+        columnSource:[
+            {
+                title: '姓名',
+                dataIndex: 'name',
+                width:100,
+
+            },
+            {
+                title: '年龄',
+                dataIndex: 'age',
+                width:100,
+                minimumWidth:100
+            },
+            {
+                title: '住址',
+                dataIndex: 'address',
+                width:200
+            },
+            {
+                title: '别名',
+                dataIndex: 'nickname',
+                width:100
+            }
+        ]
+    }
+
+
+}
diff --git a/src/imports/FluentUI/Controls/FluCopyableText.qml b/src/imports/FluentUI/Controls/FluCopyableText.qml
index ab408430..14d1392d 100644
--- a/src/imports/FluentUI/Controls/FluCopyableText.qml
+++ b/src/imports/FluentUI/Controls/FluCopyableText.qml
@@ -17,6 +17,9 @@ TextEdit {
     bottomPadding: 0
     selectionColor: FluTheme.primaryColor.lightest
     font:FluTextStyle.Body
+    onSelectedTextChanged: {
+        control.forceActiveFocus()
+    }
     TapHandler {
         acceptedButtons: Qt.RightButton
         onTapped: control.echoMode !== TextInput.Password && menu.popup()
diff --git a/src/imports/FluentUI/Controls/FluScrollIndicator.qml b/src/imports/FluentUI/Controls/FluScrollIndicator.qml
new file mode 100644
index 00000000..3e4b1685
--- /dev/null
+++ b/src/imports/FluentUI/Controls/FluScrollIndicator.qml
@@ -0,0 +1,49 @@
+import QtQuick
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+T.ScrollIndicator {
+    id: control
+
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+
+    padding: 2
+
+    contentItem: Rectangle {
+        implicitWidth: 2
+        implicitHeight: 2
+
+        color: control.palette.mid
+        visible: control.size < 1.0
+        opacity: 0.0
+
+        states: State {
+            name: "active"
+            when: control.active
+            PropertyChanges {
+                target: control
+                contentItem.opacity: 0.75
+            }
+        }
+
+        transitions: [
+            Transition {
+                from: "active"
+                SequentialAnimation {
+                    PauseAnimation {
+                        duration: 450
+                    }
+                    NumberAnimation {
+                        target: control.contentItem
+                        duration: 200
+                        property: "opacity"
+                        to: 0.0
+                    }
+                }
+            }
+        ]
+    }
+}
diff --git a/src/imports/FluentUI/Controls/FluTableModelColumn.qml b/src/imports/FluentUI/Controls/FluTableModelColumn.qml
new file mode 100644
index 00000000..f3921140
--- /dev/null
+++ b/src/imports/FluentUI/Controls/FluTableModelColumn.qml
@@ -0,0 +1,5 @@
+import Qt.labs.qmlmodels
+
+TableModelColumn{
+
+}
diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml
index 98b5c8d3..d7334df9 100644
--- a/src/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/imports/FluentUI/Controls/FluTableView.qml
@@ -102,7 +102,11 @@ Item {
                             onPositionChanged:
                                 (mouse)=>{
                                     var delta = Qt.point(mouse.x - clickPos.x, mouse.y - clickPos.y)
-                                    item_column.width = Math.max(item_column.width+delta.x,item_column_text.implicitWidth+28)
+                                    var minimumWidth = item_column_text.implicitWidth+28
+                                    if(model.minimumWidth){
+                                        minimumWidth = model.minimumWidth
+                                    }
+                                    item_column.width = Math.max(item_column.width+delta.x,minimumWidth)
                                 }
                         }
                     }
@@ -136,7 +140,7 @@ Item {
             interactive: false
             header: header_columns
             footer: Item{
-                height: pageVisible ? 50 : 0
+                height: pageVisible ? 54 : 0
                 clip: true
                 width: layout_table.width
                 FluPagination{
@@ -189,19 +193,6 @@ Item {
                     anchors.right: parent.right
                     anchors.bottom: parent.bottom
                 }
-                //                Row{
-                //                    id: table_row_back
-                //                    spacing: 0
-                //                    anchors.fill: parent
-                //                    Repeater{
-                //                        model: model_values
-                //                        delegate:Rectangle{
-                //                             width: layout_table.headerItem.widthByColumnIndex(index)
-                //                             height: item_control.height
-                //                             color:"red"
-                //                        }
-                //                    }
-                //                }
                 Row{
                     id: table_row
                     spacing: 0
@@ -210,8 +201,16 @@ Item {
                         id:repeater_rows
                         model: model_values
                         delegate:FluControl{
+                            id:item_row_control
                             width: layout_table.headerItem.widthByColumnIndex(index)
                             height: item_control.height
+                            focusPolicy:Qt.TabFocus | Qt.ClickFocus
+                            background: Item{
+                                FluFocusRectangle{
+                                    visible: item_row_control.activeFocus
+                                    radius:8
+                                }
+                            }
                             Loader{
                                 id:item_column_loader
                                 property var model : modelData
@@ -243,6 +242,7 @@ Item {
             }
         }
     }
+
     Component{
         id:com_text
         Item{
diff --git a/src/imports/FluentUI/Controls/FluTableView2.qml b/src/imports/FluentUI/Controls/FluTableView2.qml
new file mode 100644
index 00000000..c0c1171d
--- /dev/null
+++ b/src/imports/FluentUI/Controls/FluTableView2.qml
@@ -0,0 +1,84 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Basic
+import QtQuick.Layouts
+import Qt.labs.qmlmodels
+import FluentUI
+
+TableView {
+    property var columnSource
+    property var dataSource
+    id:control
+    ListModel{
+        id:model_columns
+    }
+    columnWidthProvider: function (column) {
+        return 100
+    }
+    rowHeightProvider: function (column) {
+        return 60
+    }
+    topMargin: columnsHeader.implicitHeight
+    model: table_model
+    ScrollBar.horizontal: FluScrollBar{}
+    ScrollBar.vertical: FluScrollBar{}
+    clip: true
+    boundsBehavior:Flickable.StopAtBounds
+    delegate: Rectangle {
+        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+        FluText {
+            text: display
+            anchors.fill: parent
+            anchors.margins: 10
+            verticalAlignment: Text.AlignVCenter
+        }
+    }
+
+    onColumnSourceChanged: {
+        if(columnSource.length!==0){
+            var com_column = Qt.createComponent("FluTableModelColumn.qml")
+            if (com_column.status === Component.Ready) {
+                var columns= []
+                columnSource.forEach(function(item){
+                    var column = com_column.createObject(table_model,{display:item.dataIndex});
+                    columns.push(column)
+                })
+                table_model.columns = columns
+            }
+        }
+    }
+
+    onDataSourceChanged: {
+        table_model.clear()
+        dataSource.forEach(function(item){
+            table_model.appendRow(item)
+        })
+    }
+
+    TableModel {
+        id:table_model
+    }
+
+    Row {
+        id: columnsHeader
+        y: control.contentY
+        z: 2
+        Repeater {
+            model: columnSource
+            Rectangle{
+                height: 35
+                width: control.columnWidthProvider(index)
+                color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
+                FluText {
+                    text: modelData.title
+                    font: FluTextStyle.BodyStrong
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        left: parent.left
+                        leftMargin: 10
+                    }
+                }
+            }
+        }
+    }
+}