From 08ec074bad3b8646d0a635da017679bf1b1a786a Mon Sep 17 00:00:00 2001
From: JianjunLiu <cqljj123@126.com>
Date: Tue, 8 Nov 2022 10:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化表格
---
 designer/utslvcldcomponents.tsf | 22 +++++++++++++++++++++-
 funcext/tvclib/tslvcl.tsf       |  2 +-
 funcext/tvclib/utslvclgrid.tsf  | 19 +++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/designer/utslvcldcomponents.tsf b/designer/utslvcldcomponents.tsf
index 2538b17..cd096a1 100644
--- a/designer/utslvcldcomponents.tsf
+++ b/designer/utslvcldcomponents.tsf
@@ -2593,8 +2593,28 @@ type TDgridctl = class(TDComponent)
     cvs.drawtext(format('%d,%d',i,j),rec,DT_VCENTER .| DT_SINGLELINE .| DT_CENTER .| DT_NOPREFIX);
     inherited;
 ");
+    ev := array(
+        "event":"onhitcellsizer",
+        "name":"hitsizer",
+        "param":array("o","e"),
+        "virtual":true,
+        "body":
+"     {**
+        @explan(˵Ã÷) ÃüÖе¥Ôª¸ñµ÷Õû´óС±ß¿ò %%
+        @param(o)(tgridctl) grid¶ÔÏó %%
+        @param(e)(tuieventbase) ÏûÏ¢¶ÔÏó°üÀ¨,µÈwparam=1 ±íʾÐÐ=2 ±íʾÁÐ,lparamΪÃüÖеÄÐлòÕßÁÐÐòºÅ %%
+    **}
+    //»æÖƱíÍ·
+    //if e.wparam=1 then echo '\\r\\nrow:',e.lparam;
+    //if e.wparam=2 then echo '\\r\\ncol:',e.lparam;
+    if e.lparam<o.FixedRows or e.lparam<o.FixedColumns then //ÐÐÁб겻Äܵ÷Õû¿í¶È¸ß¶È
+    begin
+        e.skip := true;//ºöÂÔµ÷Õû¿í¶È
+    end
+    inherited;"
+    );
+    SetDefalutEvent(ev,true);
     end 
-
 end 
 type TDedit= class(TDComponent)
     function HitTip();override;
diff --git a/funcext/tvclib/tslvcl.tsf b/funcext/tvclib/tslvcl.tsf
index af6c086..421d1e1 100644
--- a/funcext/tvclib/tslvcl.tsf
+++ b/funcext/tvclib/tslvcl.tsf
@@ -3387,7 +3387,7 @@ type TGridCtl = class(TcustomGridCtl)
             "autoscroll","columncount","itemcount",
             "itemheight","mousesizecell","fixedrows","fixedcolumns",
             "columnheader","columns",
-            "ondrawcell","onmousewheel","onmousemove",
+            "ondrawcell","onhitcellsizer","onmousewheel","onmousemove",
             "onmousedown","onmouseup","ondblclick",
             "onkeyup","onkeydown","onkeypress","onnotification");
     end  
diff --git a/funcext/tvclib/utslvclgrid.tsf b/funcext/tvclib/utslvclgrid.tsf
index fef9b20..816350d 100644
--- a/funcext/tvclib/utslvclgrid.tsf
+++ b/funcext/tvclib/utslvclgrid.tsf
@@ -577,7 +577,8 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
             //fleftdowncell := getindexbypos(x,y);
         end   
         inherited;
-    end 
+    end
+ 
     function WMLButtonUp(o,e);override;
     begin
         fmouseleftdown := false;
@@ -657,6 +658,7 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
                         if abs(x-bx-v)<3 then
                         begin
                             if isinmergedcolmn(i,y+5) then break;
+                            if callondragcellsize(i,2) then break;
                             FCurrentSizeId := i;
                             FCurrentSizePos := x;
                             FCursorRect := array(clientToScreen(max(bx+6,rc[0]+6),y-10),clientToScreen(rc[2],y+10));
@@ -679,6 +681,7 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
                         if abs(y-bx-v)<3 then
                         begin
                             if isinmergedrow(i,x+5) then break;
+                            if callondragcellsize(i,1) then break;
                             FCurrentSizeId := i;
                             FCurrentSizePos := y;
                             FCursorRect := array(clientToScreen(x-10,max(rc[1]+6,bx+6)),clientToScreen(x+10,rc[3]));
@@ -730,6 +733,7 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
     function Recycling();override;
     begin    
         Fondrawcell := nil;
+        fonhitcellsizer := nil;
         FMergers := array();
         inherited;
     end 
@@ -742,6 +746,7 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
     property ColumnCount:integer read GetColumnCount write setcolumncount;
     property VariableRows read FVariableRows write SetVariableRows;
     property ondrawcell:eventhandler read Fondrawcell write Fondrawcell;
+    property onhitcellsizer:eventhandler read fonhitcellsizer write fonhitcellsizer;
     {**
     @param(ItemCount)(integer) ÐÐÊý %%
     @param(MouseSizeCell)(bool) Êó±ê¸Ä±äÁпí %%
@@ -750,7 +755,16 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
     protected
     property cellsizerstate read   fcellsizerstate;//µ÷Õû´óС
     private
-        function isinmergedcolmn(i,y);
+    function callondragcellsize(i,r);
+    begin
+        if fonhitcellsizer then 
+        begin 
+            e := new tuieventbase(0,r,i,0);
+            CallMessgeFunction(fonhitcellsizer,self(true),e);
+            return e.skip;
+        end         
+    end 
+    function isinmergedcolmn(i,y);
     begin
         for idx,v in FMergers do 
         begin
@@ -1042,6 +1056,7 @@ type TcustomGridCtl = class(tcustomscrollcontrol)  //
     fselbkcolor;
     //
     Fondrawcell;
+    fonhitcellsizer;
     fmouseleftdown;
     fcellsizerstate; // 0 µ÷Õû´óСÎÞ¹Ø ,1 ×¼±¸ÍÏק ,2 ÍÏקÖÐ 3 ½áÊøÍÏק
     FScroolChanged;