diff --git a/public10/ThreeFun/Form/U_SysLogHelp.dfm b/public10/ThreeFun/Form/U_SysLogHelp.dfm index 85b8a54..c2c02db 100644 --- a/public10/ThreeFun/Form/U_SysLogHelp.dfm +++ b/public10/ThreeFun/Form/U_SysLogHelp.dfm @@ -61,6 +61,7 @@ object frmSysLogHelp: TfrmSysLogHelp ExplicitHeight = 503 object tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DataSource1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -87,6 +88,7 @@ object frmSysLogHelp: TfrmSysLogHelp object tv1OperMan: TcxGridDBColumn Caption = #25805#20316#20154 DataBinding.FieldName = 'Operor' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Options.Focusing = False @@ -95,30 +97,35 @@ object frmSysLogHelp: TfrmSysLogHelp object tv1jopertime: TcxGridDBColumn Caption = #25805#20316#26102#38388 DataBinding.FieldName = 'opertime' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 137 end object tv1Model: TcxGridDBColumn Caption = #25152#23646#27169#22359 DataBinding.FieldName = 'Model' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 127 end object tv1acction: TcxGridDBColumn Caption = #25805#20316#31867#22411 DataBinding.FieldName = 'acction' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 97 end object tv1Result: TcxGridDBColumn Caption = #32467#26524 DataBinding.FieldName = 'Result' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 63 end object tv1Opevent: TcxGridDBColumn Caption = #25805#20316#20869#23481 DataBinding.FieldName = 'Opevent' + DataBinding.IsNullValueType = True Width = 452 end end diff --git a/public10/ThreeFun/Form/U_SysLogHelp.pas b/public10/ThreeFun/Form/U_SysLogHelp.pas index 744bd75..a875a68 100644 --- a/public10/ThreeFun/Form/U_SysLogHelp.pas +++ b/public10/ThreeFun/Form/U_SysLogHelp.pas @@ -9,7 +9,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, ADODB, StdCtrls, ExtCtrls, ImgList, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, - cxNavigator, dxDateRanges, System.ImageList; + cxNavigator, dxDateRanges, System.ImageList, dxScrollbarAnnotations; type TfrmSysLogHelp = class(TForm) diff --git a/public10/ThreeFun/Form/U_ZDYHelp.pas b/public10/ThreeFun/Form/U_ZDYHelp.pas index b63aa4f..09c2bbb 100644 --- a/public10/ThreeFun/Form/U_ZDYHelp.pas +++ b/public10/ThreeFun/Form/U_ZDYHelp.pas @@ -9,24 +9,9 @@ uses cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, DBClient, ADODB, ImgList, StdCtrls, ExtCtrls, cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, - cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, - dxDateRanges, dxBarBuiltInMenu, System.ImageList, cxContainer, cxImageList, - 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, dxSkinWXI, dxSkinXmas2008Blue, dxScrollbarAnnotations; + cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxScrollbarAnnotations, + cxContainer, dxBarBuiltInMenu, cxImageList, System.ImageList, dxSkinsCore, + dxSkinsDefaultPainters; type TfrmZDYHelp = class(TfrmBaseInput) diff --git a/public10/ThreeFun/Form/U_ZDYHelpSel.dfm b/public10/ThreeFun/Form/U_ZDYHelpSel.dfm index 8e8a7d9..e2864a8 100644 --- a/public10/ThreeFun/Form/U_ZDYHelpSel.dfm +++ b/public10/ThreeFun/Form/U_ZDYHelpSel.dfm @@ -110,7 +110,6 @@ object frmZDYHelpSel: TfrmZDYHelpSel Font.Height = -16 Font.Name = #24494#36719#38597#40657 Font.Style = [] - Images = DataLink_TradeMarket.cxImageList_bar List = True ParentColor = False ParentFont = False diff --git a/public10/ThreeFun/Form/U_ZDYHelpSel.pas b/public10/ThreeFun/Form/U_ZDYHelpSel.pas index 078d0a0..73cd8d3 100644 --- a/public10/ThreeFun/Form/U_ZDYHelpSel.pas +++ b/public10/ThreeFun/Form/U_ZDYHelpSel.pas @@ -11,7 +11,7 @@ uses cxCheckBox, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, dxSkinsCore, dxSkinsDefaultPainters, cxNavigator, dxDateRanges, System.ImageList, System.Types, dxBarBuiltInMenu, cxGridCustomPopupMenu, cxGridPopupMenu, - dxSkinWXI, dxScrollbarAnnotations, cxContainer; + dxScrollbarAnnotations, cxContainer; type TfrmZDYHelpSel = class(TForm)