V3.1.8

SunnyUI.Demo/Controls/FCombobox.cs

@@ -57,6 +57,13 @@ namespace Sunny.UI.Demo
             uiComboDataGridView2.FilterColumnName = "Column1"; //不设置则全部列过滤
         }
 
+        public override void Final()
+        {
+            base.Final();
+            uiComboBox3.HideFilterForm();
+            uiComboBox4.HideFilterForm();
+        }
+
         private void UiComboDataGridView1_SelectIndexChange(object sender, int index)
         {
             uiComboDataGridView1.Text = dt.Rows[index]["Column1"].ToString();

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -38,8 +38,8 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.1.5.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.3.1.5\lib\net40\SunnyUI.dll</HintPath>
+    <Reference Include="SunnyUI, Version=3.1.8.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
+      <HintPath>..\packages\SunnyUI.3.1.8\lib\net40\SunnyUI.dll</HintPath>
     </Reference>
     <Reference Include="SunnyUI.Common, Version=3.1.2.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
       <HintPath>..\packages\SunnyUI.Common.3.1.2\lib\net40\SunnyUI.Common.dll</HintPath>

SunnyUI.Demo/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SunnyUI" version="3.1.5" targetFramework="net40" />
+  <package id="SunnyUI" version="3.1.8" targetFramework="net40" />
   <package id="SunnyUI.Common" version="3.1.2" targetFramework="net40" />
 </packages>

SunnyUI/Controls/UIComboBox.cs

@@ -89,12 +89,13 @@ namespace Sunny.UI
         {
             if (ShowFilter)
             {
-                int cnt = filterForm.ListBox.Items.Count;
-                int idx = filterForm.ListBox.SelectedIndex;
-
                 if (e.KeyCode == Keys.Down || e.KeyCode == Keys.Up)
                 {
-                    ShowDropDownFilter();
+                    if (!FilterItemForm.Visible)
+                        ShowDropDownFilter();
+                    int cnt = filterForm.ListBox.Items.Count;
+                    int idx = filterForm.ListBox.SelectedIndex;
+
                     if (cnt > 0)
                     {
                         if (e.KeyCode == Keys.Down)
@@ -118,6 +119,9 @@ namespace Sunny.UI
                 {
                     if (FilterItemForm.Visible)
                     {
+                        int cnt = filterForm.ListBox.Items.Count;
+                        int idx = filterForm.ListBox.SelectedIndex;
+
                         if (cnt > 0 && idx >= 0 && idx < cnt)
                         {
                             SelectTextChange = true;
@@ -277,11 +281,11 @@ namespace Sunny.UI
                     ShowDropDownFilter();
                 }
 
-                filterForm.ListBox.Items.Clear();
-                filterList.Clear();
-
                 if (Text.IsValid())
                 {
+                    filterForm.ListBox.Items.Clear();
+                    filterList.Clear();
+
                     if (DataSource == null)
                     {
                         foreach (var item in Items)
@@ -322,8 +326,17 @@ namespace Sunny.UI
             }
         }
 
+        public void HideFilterForm()
+        {
+            if (FilterItemForm.Visible)
+                FilterItemForm.Close();
+        }
+
         private void FillFilterTextEmpty()
         {
+            filterForm.ListBox.Items.Clear();
+            filterList.Clear();
+
             if (DataSource == null)
             {
                 foreach (var item in Items)

SunnyUI/Controls/UIGlobal.cs

@@ -29,7 +29,7 @@ namespace Sunny.UI
         /// <summary>
         /// 版本
         /// </summary>
-        public const string Version = "SunnyUI.Net V3.1.5";
+        public const string Version = "SunnyUI.Net V3.1.8";
 
         public const int EditorMinHeight = 20;
         public const int EditorMaxHeight = 60;

SunnyUI/SunnyUI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0-windows;net472;net40</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net5.0-windows;net472;net40</TargetFrameworks>
         <LangVersion>9.0</LangVersion>
         <ProjectGuid>{AB1CB247-E20B-4CBE-B269-570ADDD96C53}</ProjectGuid>
         <UseWindowsForms>true</UseWindowsForms>
@@ -9,7 +9,7 @@
         <Description>SunnyUI.Net 是基于.Net Framework 4.0+、.Net 5、.Net 6 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
         <Copyright>CopyRight © SunnyUI.Net 2012-2022</Copyright>
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
-        <Version>3.1.5</Version>
+        <Version>3.1.8</Version>
         <Authors>ShenYonghua</Authors>
         <Company>SunnyUI.Net</Company>
         <PackageId>SunnyUI</PackageId>
@@ -17,7 +17,7 @@
         <RepositoryUrl>https://gitee.com/yhuse/SunnyUI</RepositoryUrl>
         <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
         <PackageIcon>SunnyUI.png</PackageIcon>
-        <SignAssembly>False</SignAssembly>
+        <SignAssembly>True</SignAssembly>
         <AssemblyOriginatorKeyFile>D:\MyDocuments\SunnyUI.pfx</AssemblyOriginatorKeyFile>
         <DelaySign>False</DelaySign>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>