Browse Source

分类显示最下面的显示不完全BUG

zhangjiaxin 7 months ago
parent
commit
6472fda78a

+ 1 - 1
Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0.5,1,2,5,30,100,200" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="5,15,25,50,100,150,200" Version="1.1.1" />

+ 1 - 1
Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -5,5 +5,5 @@
   <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />
   <Member RegName="PartSizeFile" name="lj.psf" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
-  <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="DMAX" />
+  <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="ECD" />
 </XMLData>

BIN
Bin/x64/Debug/Config/SysData/OTS_TC_Axia_per.db


+ 10 - 2
OTSIncAReportApp/1-UI/OTSReportExport/Category.cs

@@ -54,14 +54,17 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
                     flowLayoutPanel.WrapContents = true;
                     flowLayoutPanel.Dock = DockStyle.Fill;
                     flowLayoutPanel.AutoScroll = true;
-                    flowLayoutPanel.Padding = new Padding(15);
+                    flowLayoutPanel.Padding = new Padding(20, 10, 20, 25);
                     panel2.Controls.Add(flowLayoutPanel);
                     for (int i = 0; i < ElementList.Rows.Count; i++)
                     {
                         // 添加控件到 FlowLayoutPanel 中
                         CheckBox box1 = new CheckBox();
                         box1.Text = ElementList.Rows[i]["StrName"].ToString();
-                        box1.Width = flowLayoutPanel.Width - 30;
+                        box1.Width = flowLayoutPanel.Width - 40;
+                        box1.Height = 25;
+                        Font font = new Font("宋体", 15, FontStyle.Regular);
+                        box1.Font = font;
                         if (CheckTheOptions.Count == 0)
                         {
                             if (!isRemove)
@@ -79,6 +82,11 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
                         }
                         flowLayoutPanel.Controls.Add(box1);
                     }
+                    Panel panel = new Panel();
+                    panel.Size = new Size(10, 10);
+                    panel.BackColor = Color.Transparent;
+                    flowLayoutPanel.Controls.Add(panel);
+
 
                     this.checkBox_selall.CheckedChanged -= new System.EventHandler(this.checkBox_selall_CheckedChanged);
                     checkBox_selall.Checked = true;

+ 1 - 0
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1617,6 +1617,7 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>