From 7bfa9f01916f4f9ca109c76b02e44d81f0d698b9 Mon Sep 17 00:00:00 2001
From: zhuzihcu <zhuzichu520@gmail.com>
Date: Fri, 16 Jun 2023 09:30:21 +0800
Subject: [PATCH] update

---
 example/qml/page/T_TableView2.qml               |  7 +++++--
 src/imports/FluentUI/Controls/FluTableView2.qml | 11 ++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/example/qml/page/T_TableView2.qml b/example/qml/page/T_TableView2.qml
index 10ede0d0..efa4892e 100644
--- a/example/qml/page/T_TableView2.qml
+++ b/example/qml/page/T_TableView2.qml
@@ -78,6 +78,7 @@ FluContentPage{
                 title: '姓名',
                 dataIndex: 'name',
                 width:100,
+                minimumWidth:50
 
             },
             {
@@ -85,7 +86,8 @@ FluContentPage{
                 dataIndex: 'age',
                 editDelegate:com_combobox,
                 width:100,
-                minimumWidth:100
+                minimumWidth:100,
+                maximumWidth: 100
             },
             {
                 title: '住址',
@@ -95,7 +97,8 @@ FluContentPage{
             {
                 title: '别名',
                 dataIndex: 'nickname',
-                width:100
+                width:100,
+
             }
         ]
     }
diff --git a/src/imports/FluentUI/Controls/FluTableView2.qml b/src/imports/FluentUI/Controls/FluTableView2.qml
index 52a49e29..42827769 100644
--- a/src/imports/FluentUI/Controls/FluTableView2.qml
+++ b/src/imports/FluentUI/Controls/FluTableView2.qml
@@ -71,7 +71,16 @@ Rectangle {
             columnWidthProvider: function(column) {
                 let w = explicitColumnWidth(column)
                 if (w >= 0){
-                    return Math.max(100, w)
+                    var minimumWidth = columnSource[column].minimumWidth
+                    var maximumWidth = columnSource[column].maximumWidth
+                    if(!minimumWidth){
+                        minimumWidth = 100
+                    }
+                    if(!maximumWidth){
+                        maximumWidth = 65535
+                    }
+
+                    return Math.min(Math.max(minimumWidth, w),maximumWidth)
                 }
                 return implicitColumnWidth(column)
             }