From 81d5c8477f15278f2f5603c0f618e1bddbd25aa8 Mon Sep 17 00:00:00 2001 From: sgwp <63001967@qq.com> Date: Fri, 25 Oct 2024 16:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public10/design/U_MainBaseList.dfm | 125 +++++++++++++++++++------ public10/design/U_MainBaseList.pas | 43 +++++---- public10/design/U_QryBaseList.dfm | 8 +- public10/design/U_QryBaseList.pas | 8 +- public10/design/U_QryPivotBaseList.dfm | 1 + 5 files changed, 127 insertions(+), 58 deletions(-) diff --git a/public10/design/U_MainBaseList.dfm b/public10/design/U_MainBaseList.dfm index 12b22db..41b8ffe 100644 --- a/public10/design/U_MainBaseList.dfm +++ b/public10/design/U_MainBaseList.dfm @@ -3,7 +3,7 @@ object frmMainBaseList: TfrmMainBaseList Top = 0 Caption = 'frmMainBaseList' ClientHeight = 538 - ClientWidth = 1077 + ClientWidth = 1112 Color = clBtnFace Font.Charset = GB2312_CHARSET Font.Color = clWindowText @@ -11,6 +11,7 @@ object frmMainBaseList: TfrmMainBaseList Font.Name = #24494#36719#38597#40657 Font.Style = [] OldCreateOrder = False + WindowState = wsMaximized OnClose = FormClose OnCreate = FormCreate OnDestroy = FormDestroy @@ -21,8 +22,8 @@ object frmMainBaseList: TfrmMainBaseList Tag = 1 Left = 0 Top = 0 - Width = 1077 - Height = 30 + Width = 1112 + Height = 60 AutoSize = True ButtonHeight = 30 ButtonWidth = 115 @@ -37,45 +38,103 @@ object frmMainBaseList: TfrmMainBaseList Left = 0 Top = 0 AutoSize = True - Caption = #26597#35810 - ImageIndex = 8 + Caption = #21047#26032 + ImageIndex = 1 OnClick = TrefreshClick end - object Tprint: TToolButton + object Tadd: TToolButton Left = 71 Top = 0 AutoSize = True + Caption = #26032#22686 + ImageIndex = 9 + end + object ToolButton2: TToolButton + Left = 142 + Top = 0 + AutoSize = True + Caption = #20462#25913 + ImageIndex = 3 + end + object ToolButton3: TToolButton + Left = 213 + Top = 0 + AutoSize = True + Caption = #21024#38500 + ImageIndex = 5 + end + object Tcheck: TToolButton + Left = 284 + Top = 0 + AutoSize = True + Caption = #23457#26680 + ImageIndex = 12 + end + object Tuncheck: TToolButton + Left = 355 + Top = 0 + AutoSize = True + Caption = #25764#38144#23457#26680 + ImageIndex = 11 + end + object Tzdy1: TToolButton + Left = 458 + Top = 0 + AutoSize = True + Caption = #33258#23450#20041'1' + Visible = False + end + object Tzdy2: TToolButton + Left = 526 + Top = 0 + AutoSize = True + Caption = #33258#23450#20041'2' + Wrap = True + Visible = False + end + object Tzdy3: TToolButton + Left = 0 + Top = 30 + AutoSize = True + Caption = #33258#23450#20041'3' + Visible = False + end + object Tprint: TToolButton + Left = 68 + Top = 30 + AutoSize = True Caption = #23548#20986'Excel' ImageIndex = 28 OnClick = TprintClick end object TprintGrid: TToolButton - Left = 180 - Top = 0 + Left = 177 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 21 OnClick = TprintGridClick end object TsaveGrid: TToolButton - Left = 251 - Top = 0 + Left = 248 + Top = 30 AutoSize = True Caption = #20445#23384#26684#24335 ImageIndex = 30 OnClick = TsaveGridClick end - object ToolButton1: TToolButton - Left = 354 - Top = 0 + object TgridSet: TToolButton + Left = 351 + Top = 30 AutoSize = True Caption = #34920#26684#21015#35774#32622 ImageIndex = 16 - OnClick = ToolButton1Click + Visible = False + OnClick = TgridSetClick end object Tclose: TToolButton - Left = 473 - Top = 0 + Left = 470 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 7 @@ -83,11 +142,16 @@ object frmMainBaseList: TfrmMainBaseList end end object cxGrid1: TcxGrid - Left = 8 - Top = 209 - Width = 1033 - Height = 321 + Left = 0 + Top = 187 + Width = 1112 + Height = 351 + Align = alClient TabOrder = 1 + ExplicitLeft = 8 + ExplicitTop = 209 + ExplicitWidth = 1033 + ExplicitHeight = 321 object tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -199,8 +263,8 @@ object frmMainBaseList: TfrmMainBaseList end object dxLayoutControl_query: TdxLayoutControl Left = 0 - Top = 75 - Width = 1077 + Top = 105 + Width = 1112 Height = 45 Align = alTop TabOrder = 2 @@ -208,6 +272,9 @@ object frmMainBaseList: TfrmMainBaseList LayoutLookAndFeel = BaseDataLink.dxLayoutSkinLookAndFeel1 OptionsItem.SizableHorz = True OptionsItem.SizableVert = True + OnDblClick = dxLayoutControl_queryDblClick + ExplicitTop = 75 + ExplicitWidth = 1077 object custName: TcxTextEdit Tag = 2 Left = 262 @@ -280,16 +347,18 @@ object frmMainBaseList: TfrmMainBaseList end object Panel_page: TPanel Left = 0 - Top = 120 - Width = 1077 + Top = 150 + Width = 1112 Height = 37 Align = alTop AutoSize = True BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 3 + ExplicitTop = 120 + ExplicitWidth = 1077 DesignSize = ( - 1077 + 1112 37) object LBCPAP: TLabel Left = 425 @@ -352,8 +421,8 @@ object frmMainBaseList: TfrmMainBaseList end inline frmFrameDateSel1: TfrmFrameDateSel10 Left = 0 - Top = 30 - Width = 1077 + Top = 60 + Width = 1112 Height = 45 Align = alTop AutoSize = True @@ -364,7 +433,7 @@ object frmMainBaseList: TfrmMainBaseList ExplicitTop = 30 ExplicitWidth = 1077 inherited dxLayoutControl1: TdxLayoutControl - Width = 1077 + Width = 1112 ExplicitWidth = 1077 inherited BegDate: TcxDateEdit Left = 116 diff --git a/public10/design/U_MainBaseList.pas b/public10/design/U_MainBaseList.pas index 8471f5f..a4d1623 100644 --- a/public10/design/U_MainBaseList.pas +++ b/public10/design/U_MainBaseList.pas @@ -14,23 +14,7 @@ uses cxContainer, dxCore, cxDateUtils, dxLayoutcxEditAdapters, dxLayoutContainer, cxMaskEdit, cxDropDownEdit, cxCalendar, cxTextEdit, dxLayoutControl, FrameDateSel, Datasnap.DBClient, cxMemo, Vcl.StdCtrls, Vcl.ExtCtrls, - cxGeometry, dxFramedControl, dxPanel, FrameDateSel10, dxSkinBasic, - dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, - dxSkinDarkroom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, - dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, dxSkinHighContrast, - dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, - dxSkinMcSkin, dxSkinMetropolis, dxSkinMetropolisDark, dxSkinMoneyTwins, - dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, - dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinOffice2010Black, - dxSkinOffice2010Blue, dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, - dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinOffice2016Colorful, - dxSkinOffice2016Dark, dxSkinOffice2019Black, dxSkinOffice2019Colorful, - dxSkinOffice2019DarkGray, dxSkinOffice2019White, dxSkinPumpkin, dxSkinSeven, - dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, dxSkinSilver, - dxSkinSpringtime, dxSkinStardust, dxSkinSummer2008, dxSkinTheAsphaltWorld, - dxSkinTheBezier, dxSkinValentine, dxSkinVisualStudio2013Blue, - dxSkinVisualStudio2013Dark, dxSkinVisualStudio2013Light, dxSkinVS2010, - dxSkinWhiteprint, dxSkinXmas2008Blue; + cxGeometry, dxFramedControl, dxPanel, FrameDateSel10; type TfrmMainBaseList = class(TForm) @@ -76,7 +60,15 @@ type TCBNOR: TcxComboBox; Label31: TLabel; frmFrameDateSel1: TfrmFrameDateSel10; - ToolButton1: TToolButton; + TgridSet: TToolButton; + Tadd: TToolButton; + ToolButton2: TToolButton; + ToolButton3: TToolButton; + Tcheck: TToolButton; + Tuncheck: TToolButton; + Tzdy1: TToolButton; + Tzdy2: TToolButton; + Tzdy3: TToolButton; procedure TrefreshClick(Sender: TObject); procedure TprintClick(Sender: TObject); procedure TprintGridClick(Sender: TObject); @@ -89,7 +81,8 @@ type procedure BTLPClick(Sender: TObject); procedure BTNPClick(Sender: TObject); procedure TCBNORPropertiesChange(Sender: TObject); - procedure ToolButton1Click(Sender: TObject); + procedure TgridSetClick(Sender: TObject); + procedure dxLayoutControl_queryDblClick(Sender: TObject); private fWindowDesign: TWindowFormdesign; CurrentPage, RecordsNumber: Integer; @@ -165,7 +158,7 @@ begin close; end; -procedure TfrmMainBaseList.ToolButton1Click(Sender: TObject); +procedure TfrmMainBaseList.TgridSetClick(Sender: TObject); begin fWindowDesign.OpenGridDesignWin10(fDesignCode,'cxgrid1',tv1); end; @@ -323,6 +316,11 @@ begin Tv1.EndUpdate; end; end; +procedure TfrmMainBaseList.dxLayoutControl_queryDblClick(Sender: TObject); +begin + layoutDesign(TdxLayoutControl(Sender),ADOQueryBaseCmd,PWideChar(dcode)); +end; + /// procedure TfrmMainBaseList.FormClose(Sender: TObject; var Action: TCloseAction); begin @@ -353,9 +351,9 @@ begin fDesignCode := fDllFileName +'|'+self.name+ '|' + intTostr(fformId) + '|' + 'cxgrid1'; if DParameters8<>'1' then begin - fWindowDesign.FormStyleInit(self, fFormId, ADOQueryBaseTemp, ADOQueryBaseCmd, '', fParameters10); + fWindowDesign.FormStyleInit10(self, fFormId, ADOQueryBaseTemp, ADOQueryBaseCmd, '', fParameters10); end; - TgridLiSet.Visible:=gIsCanDesign; + TgridSet.Visible:=gIsCanDesign; mdesignCode := fDllFileName +'|'+self.name+ '|' + intTostr(fformId) + '|' + 'cxgrid1'; //增加动态条件 addQryContionByLay(ADOQueryBaseTemp,fformId,'cxgrid1',dxLayoutControl_query,7); @@ -367,6 +365,7 @@ end; /// procedure TfrmMainBaseList.initGrid(); begin + if fProcedureName='' then exit; if fQueryType='criteria' then begin doQueryByCriteria() ; diff --git a/public10/design/U_QryBaseList.dfm b/public10/design/U_QryBaseList.dfm index ab0d5c8..9cbbd87 100644 --- a/public10/design/U_QryBaseList.dfm +++ b/public10/design/U_QryBaseList.dfm @@ -36,8 +36,8 @@ object frmQryBaseList: TfrmQryBaseList Left = 0 Top = 0 AutoSize = True - Caption = #26597#35810 - ImageIndex = 8 + Caption = #21047#26032 + ImageIndex = 1 OnClick = TrefreshClick end object Tprint: TToolButton @@ -64,14 +64,14 @@ object frmQryBaseList: TfrmQryBaseList ImageIndex = 30 OnClick = TsaveGridClick end - object TgridLiSet: TToolButton + object TgridSet: TToolButton Left = 262 Top = 0 AutoSize = True Caption = #34920#26684#21015#35774#32622 ImageIndex = 16 Visible = False - OnClick = TgridLiSetClick + OnClick = TgridSetClick end object Tclose: TToolButton Left = 358 diff --git a/public10/design/U_QryBaseList.pas b/public10/design/U_QryBaseList.pas index 08b7767..1e50bd9 100644 --- a/public10/design/U_QryBaseList.pas +++ b/public10/design/U_QryBaseList.pas @@ -59,7 +59,7 @@ type BTLP: TButton; TCBNOR: TcxComboBox; Label31: TLabel; - TgridLiSet: TToolButton; + TgridSet: TToolButton; procedure TrefreshClick(Sender: TObject); procedure TprintClick(Sender: TObject); procedure TprintGridClick(Sender: TObject); @@ -73,7 +73,7 @@ type procedure BTNPClick(Sender: TObject); procedure TCBNORPropertiesChange(Sender: TObject); procedure dxLayoutControl_queryDblClick(Sender: TObject); - procedure TgridLiSetClick(Sender: TObject); + procedure TgridSetClick(Sender: TObject); private fWindowDesign: TWindowFormdesign; CurrentPage, RecordsNumber: Integer; @@ -149,7 +149,7 @@ begin close; end; -procedure TfrmQryBaseList.TgridLiSetClick(Sender: TObject); +procedure TfrmQryBaseList.TgridSetClick(Sender: TObject); begin fWindowDesign.OpenGridDesignWin10(fDesignCode,'cxgrid1',tv1); end; @@ -342,7 +342,7 @@ begin begin fWindowDesign.FormStyleInit10(self, fFormId, ADOQueryBaseTemp, ADOQueryBaseCmd, '', fParameters10); end; - TgridLiSet.Visible:=gIsCanDesign; + TgridSet.Visible:=gIsCanDesign; if dxLayoutControl_query.Tag<>999 then readLayOut(dxLayoutControl_query,ADOQueryBaseTemp,PWideChar( fDllFileName+'|'+self.name+'|'+dxLayoutControl_query.Name+'.ini')); fWindowDesign.fProcedureName:=fProcedureName; diff --git a/public10/design/U_QryPivotBaseList.dfm b/public10/design/U_QryPivotBaseList.dfm index d1ed87d..d4d11b8 100644 --- a/public10/design/U_QryPivotBaseList.dfm +++ b/public10/design/U_QryPivotBaseList.dfm @@ -68,6 +68,7 @@ object frmQryPivotBaseList: TfrmQryPivotBaseList AutoSize = True Caption = #34920#26684#21015#35774#32622 ImageIndex = 16 + Visible = False end object Tclose: TToolButton Left = 358