备份昨天的

RfidWeb/FormMain.cs

@@ -37,16 +37,16 @@ namespace RfidWeb
 
             var rfidSetting = RfidSetting.Current;
             InitializeComponent();
-            //if (this.FormBorderStyle == FormBorderStyle.None)
+            if (this.FormBorderStyle == FormBorderStyle.None)
-            //{
+            {
-            //    this.FormBorderStyle = FormBorderStyle.FixedSingle;
+                this.FormBorderStyle = FormBorderStyle.FixedSingle;
-            //    this.WindowState = FormWindowState.Normal;
+                this.WindowState = FormWindowState.Normal;
-            //}
+            }
-            //else
+            else
-            //{
+            {
-            //    this.FormBorderStyle = FormBorderStyle.None;
+                this.FormBorderStyle = FormBorderStyle.None;
-            //    this.WindowState = FormWindowState.Maximized;
+                this.WindowState = FormWindowState.Maximized;
-            //}
+            }
             Init();
 
         }

RfidWeb/Frm/UserAlarmShow.cs

@@ -52,7 +52,10 @@ namespace RfidWeb.Frm
             {
                 int currentFirstVisibleRowIndex = dataGridView1.FirstDisplayedScrollingRowIndex;
                 this.dataGridView1.DataSource=lsList;
-                dataGridView1.FirstDisplayedScrollingRowIndex = currentFirstVisibleRowIndex;
+                if (currentFirstVisibleRowIndex > 0)
+                {
+                    dataGridView1.FirstDisplayedScrollingRowIndex = currentFirstVisibleRowIndex;
+                }
             });
 
            // ThreadPoolX.QueueUserWorkItem(UpdateLog);

RfidWeb/RfidWeb.csproj

@@ -12,6 +12,21 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +47,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Chloe">
       <Version>5.40.0</Version>
@@ -255,6 +273,7 @@
   <ItemGroup>
     <None Include="Resources\左箭头.png" />
     <None Include="Resources\右箭头.png" />
+    <Content Include="logo.ico" />
     <Content Include="read.txt" />
     <None Include="Resources\海威图标在上.jpg" />
     <None Include="Resources\log.png" />
@@ -262,5 +281,17 @@
     <Content Include="Resources\照明开.png" />
     <None Include="Resources\脱机.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.8">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>