From 23fc907a7ca50c8e24050d2de2a36072906d91a5 Mon Sep 17 00:00:00 2001
From: sgwp <63001967@qq.com>
Date: Thu, 13 Feb 2025 14:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public10/design/U_cxGridCustomSet.pas     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_cxGridCustomSet.pas b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_cxGridCustomSet.pas
index d3ec725..37b8a19 100644
--- a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_cxGridCustomSet.pas
+++ b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_cxGridCustomSet.pas
@@ -287,22 +287,23 @@ begin mWidth := 12;
              Next;
             continue;
           end;
-          ADBColumn := tv1.GetColumnByFieldName
-          (trim(ADOQueryTmp.fieldByName('fieldName').AsString));
+//          if lowercase(trim(fieldByName('fieldName').AsString))='batchno' then
+//          begin
+//          end;
+          ADBColumn := tv1.GetColumnByFieldName (trim(ADOQueryTmp.fieldByName('fieldName').AsString));
         if ADBColumn <> nil then begin
           if (ADBColumn.Styles.Header<>nil) and (ADBColumn.Styles.Header.Font.Size<>gFontSize) then
               ADBColumn.Styles.Header.Font.Size:= gFontSize ;
           // ���ϲ���ʾ
           if not fieldByName('valid').AsBoolean then
           begin
-              ADBColumn.Visible := false;
+            ADBColumn.Visible := false;
             ADBColumn.Hidden := True;
             Next;
             continue;
           end;
 
-          ADBColumn.Name := trim(tv1.Name) +
-            trim(ADOQueryTmp.fieldByName('fieldName').AsString);
+          ADBColumn.Name := trim(tv1.Name) + trim(ADOQueryTmp.fieldByName('fieldName').AsString);
 
           if fieldByName('fixColumn').AsBoolean then
           begin
@@ -317,9 +318,12 @@ begin mWidth := 12;
           if ADBColumn.Tag = 9 then
             ADBColumn.Styles.Header := HeaderStyle;
           ADBColumn.Hidden := fieldByName('ColumnHide').AsBoolean;
-          if ADBColumn.Hidden then begin ADBColumn.Visible := false;
-          end
-          else begin ADBColumn.Visible := fieldByName('Visible').AsBoolean;
+          if ADBColumn.Hidden and (not fieldByName('Visible').AsBoolean) then
+          begin
+            ADBColumn.Visible := false;
+          end else
+          begin
+           ADBColumn.Visible := fieldByName('Visible').AsBoolean;
           end;
          /// ����������
          ///
@@ -342,8 +346,10 @@ begin mWidth := 12;
           begin
           //  ADBColumn.Summary.FooterKind:=skNone  ;
           end;
+          /////////////
           ADBColumn.Caption := trim(fieldByName('caption').AsString);
-
+          // ADBColumn.Options.Editing := not fieldByName('ReadOnly').AsBoolean;
+          //   ADBColumn.Options.Focusing := not fieldByName('ReadOnly').AsBoolean;
           Next;
           continue;
         end;
@@ -360,6 +366,7 @@ begin mWidth := 12;
           ADOQueryTmp.Next;
           continue;
         end;
+        ////////////////////////////�´���////////////////////////////////
         // �µ���
         ADBColumn := tv1.CreateColumn;
         ADBColumn.DataBinding.FieldName :=
@@ -379,6 +386,7 @@ begin mWidth := 12;
         begin
           ADBColumn.Tag := 9;
         end;
+
         ADBColumn.Visible := fieldByName('visible').AsBoolean;
         // ADBColumn.Hidden := fieldByName('ColumnHide').AsBoolean;
         ADBColumn.HeaderAlignmentHorz := taCenter;
@@ -580,6 +588,7 @@ begin
           fieldByName('oldCaption').value := mCxGridView.Columns[i].Caption;
           fieldByName('ColumnLock').value := 0;
           fieldByName('ColumnHide').value := mCxGridView.Columns[i].Hidden;
+          fieldByName('readonly').value := not mCxGridView.Columns[i].Options.Editing;
           fieldByName('ColumnOrder').value := mCxGridView.Columns[i].SortOrder;
           fieldByName('Visible').value := mCxGridView.Columns[i].Visible;