2.5.0.4

Jurioli · Jurioli · commit be9917255cef · 2025-04-05T13:19:43.000+08:00
diff --git a/Blazor.WebForm.Components.2.5.0.3.nupkg b/Blazor.WebForm.Components.2.5.0.3.nupkg
diff --git a/Blazor.WebForm.Components.2.5.0.4.nupkg b/Blazor.WebForm.Components.2.5.0.4.nupkg
diff --git a/Blazor.WebForm.Components/Base/ControlComponentBase.cs b/Blazor.WebForm.Components/Base/ControlComponentBase.cs
@@ -26,6 +26,7 @@ public abstract class ControlComponentBase<TControl> : ControlComponent<TControl
         private IReadOnlyDictionary<string, object> _parameters;
         private bool _renderedWithCascading;
         private bool _renderedWithInner;
+        private bool _captureReference;
         private TemplateControl _templateControl;
 
         //new public virtual TControl Control
@@ -321,7 +322,8 @@ protected override Task OnSetParametersAsync(ParameterViewContext context)
                     if (control != null)
                     {
                         this.Control = control;
-                        if (control.IsPostBack)
+                        _captureReference = true;
+                        if (control.IsPostBack || (control as IHandleSetInner).Rendered)
                         {
                             filter = true;
                             _renderedWithCascading = true;
@@ -353,6 +355,15 @@ protected override void OnAfterRender(bool firstRender)
             base.OnAfterRender(firstRender);
         }
 
+        protected override RenderFragment Render<TValue>(TValue control)
+        {
+            if (_captureReference)
+            {
+                (control as IHandleSetInner).Rendered = true;
+            }
+            return base.Render(control);
+        }
+
         protected virtual void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)
         {
 
diff --git a/Blazor.WebForm.Components/Blazor.WebForm.Components.csproj b/Blazor.WebForm.Components/Blazor.WebForm.Components.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Blazor.WebForm.Components.pfx</AssemblyOriginatorKeyFile>
-    <Version>2.5.0.3</Version>
+    <Version>2.5.0.4</Version>
     <RootNamespace>asp</RootNamespace>
     <Copyright>Jurio li</Copyright>
     <AssemblyName>Blazor.WebForm.Components</AssemblyName>
@@ -17,8 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="Applied" Version="1.2.1.8" />
-    <PackageReference Include="Blazor.WebForm.UI" Version="2.5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.2" />
+    <PackageReference Include="Blazor.WebForm.UI" Version="2.5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Blazor.WebForm.Components/GridView.razor b/Blazor.WebForm.Components/GridView.razor
@@ -467,6 +467,19 @@
         }
     }
 
+    [Parameter]
+    public bool AllowVirtualizing
+    {
+        get
+        {
+            return this.Control.AllowVirtualizing;
+        }
+        set
+        {
+            this.Control.AllowVirtualizing = value;
+        }
+    }
+
     protected override void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)
     {
         if (parameters.TryGetValue(nameof(this.EditIndex), out object value1) && value1 is int editIndex)
diff --git a/Blazor.WebForm.Components/Inner/Base/PropertyComponentAdapter.cs b/Blazor.WebForm.Components/Inner/Base/PropertyComponentAdapter.cs
@@ -29,7 +29,7 @@ protected internal virtual void SetInnerProperty(IReadOnlyDictionary<string, obj
 
         protected internal virtual void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)
         {
-            this.Component.SetInnerProperty(parameters);
+            this.Component.SetInnerPropertyWithCascading(parameters);
         }
 
         protected internal virtual void OnAfterRender()
diff --git a/Blazor.WebForm.Components/Inner/Common/VirtualizerSettings.cs b/Blazor.WebForm.Components/Inner/Common/VirtualizerSettings.cs
@@ -0,0 +1,24 @@
+﻿using Blazor.WebForm.UI.PropertyComponents;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components
+{
+    public partial class VirtualizerSettings : PropertyComponent<System.Web.UI.WebControls.DataBoundControl>, ICommonPropertyComponent
+    {
+        [Parameter]
+        public string SpacerElement { get; set; }
+
+        [Parameter]
+        public float? ItemSize { get; set; }
+
+        [Parameter]
+        public int? OverscanCount { get; set; }
+
+        [Parameter]
+        public int? MaxItemCount { get; set; }
+    }
+}
diff --git a/Blazor.WebForm.Components/Inner/GridView/VirtualizerSettings.cs b/Blazor.WebForm.Components/Inner/GridView/VirtualizerSettings.cs
@@ -0,0 +1,21 @@
+﻿using Blazor.WebForm.UI.PropertyComponents;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components
+{
+    [CommonPropertyAdapter(typeof(System.Web.UI.WebControls.GridView), typeof(GridViewVirtualizerSettings))]
+    public partial class VirtualizerSettings
+    {
+        protected class GridViewVirtualizerSettings : PropertyComponentAdapter<VirtualizerSettings, System.Web.UI.WebControls.GridView>
+        {
+            protected internal override void SetInnerProperty(IReadOnlyDictionary<string, object> parameters)
+            {
+                this.Owner.VirtualizerSettings.Apply(() => parameters);
+            }
+        }
+    }
+}
diff --git a/Blazor.WebForm.Components/Inner/ListView/VirtualizerSettings.cs b/Blazor.WebForm.Components/Inner/ListView/VirtualizerSettings.cs
@@ -0,0 +1,21 @@
+﻿using Blazor.WebForm.UI.PropertyComponents;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Components
+{
+    [CommonPropertyAdapter(typeof(System.Web.UI.WebControls.ListView), typeof(ListViewVirtualizerSettings))]
+    public partial class VirtualizerSettings
+    {
+        protected class ListViewVirtualizerSettings : PropertyComponentAdapter<VirtualizerSettings, System.Web.UI.WebControls.ListView>
+        {
+            protected internal override void SetInnerProperty(IReadOnlyDictionary<string, object> parameters)
+            {
+                this.Owner.VirtualizerSettings.Apply(() => parameters);
+            }
+        }
+    }
+}
diff --git a/Blazor.WebForm.Components/ListView.razor b/Blazor.WebForm.Components/ListView.razor
@@ -201,6 +201,19 @@
         }
     }
 
+    [Parameter]
+    public bool AllowVirtualizing
+    {
+        get
+        {
+            return this.Control.AllowVirtualizing;
+        }
+        set
+        {
+            this.Control.AllowVirtualizing = value;
+        }
+    }
+
     protected override void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)
     {
         if (parameters.TryGetValue(nameof(this.EditIndex), out object value1) && value1 is int editIndex)
diff --git a/Blazor.WebForm.Components/VirtualizePlaceHolder.razor b/Blazor.WebForm.Components/VirtualizePlaceHolder.razor
@@ -0,0 +1,59 @@
+﻿@using Blazor.WebForm.UI
+@using Blazor.WebForm.UI.ControlComponents
+@using System.Web.UI
+@using System.Web.UI.WebControls
+@inherits ControlComponentBase<System.Web.UI.WebControls.VirtualizePlaceHolder>
+@this.Render(this.Control)
+@code {
+    [Parameter]
+    public string SpacerElement
+    {
+        get
+        {
+            return this.Control.SpacerElement;
+        }
+        set
+        {
+            this.Control.SpacerElement = value;
+        }
+    }
+
+    [Parameter]
+    public float? ItemSize
+    {
+        get
+        {
+            return this.Control.ItemSize;
+        }
+        set
+        {
+            this.Control.ItemSize = value;
+        }
+    }
+
+    [Parameter]
+    public int? OverscanCount
+    {
+        get
+        {
+            return this.Control.OverscanCount;
+        }
+        set
+        {
+            this.Control.OverscanCount = value;
+        }
+    }
+
+    [Parameter]
+    public int? MaxItemCount
+    {
+        get
+        {
+            return this.Control.MaxItemCount;
+        }
+        set
+        {
+            this.Control.MaxItemCount = value;
+        }
+    }
+}
diff --git a/Blazor.WebForm.Components/VirtualizeTable.razor b/Blazor.WebForm.Components/VirtualizeTable.razor
@@ -0,0 +1,143 @@
+﻿@using Blazor.WebForm.UI
+@using Blazor.WebForm.UI.ControlComponents
+@using System.Web.UI
+@using System.Web.UI.WebControls
+@inherits WebControlComponent<System.Web.UI.WebControls.VirtualizeTable>
+@this.RenderWithCascading(this.Control, this.ChildContent, this.ChildLevel)
+@code {
+    [Parameter]
+    public RenderFragment ChildContent { get; set; }
+
+    [Parameter]
+    public int ChildLevel { get; set; } = 2;
+
+    [Parameter]
+    public HorizontalAlign HorizontalAlign
+    {
+        get
+        {
+            return this.Control.HorizontalAlign;
+        }
+        set
+        {
+            this.Control.HorizontalAlign = value;
+        }
+    }
+
+    [Parameter]
+    public GridLines GridLines
+    {
+        get
+        {
+            return this.Control.GridLines;
+        }
+        set
+        {
+            this.Control.GridLines = value;
+        }
+    }
+
+    [Parameter]
+    public int CellSpacing
+    {
+        get
+        {
+            return this.Control.CellSpacing;
+        }
+        set
+        {
+            this.Control.CellSpacing = value;
+        }
+    }
+
+    [Parameter]
+    public int CellPadding
+    {
+        get
+        {
+            return this.Control.CellPadding;
+        }
+        set
+        {
+            this.Control.CellPadding = value;
+        }
+    }
+
+    [Parameter]
+    public TableCaptionAlign CaptionAlign
+    {
+        get
+        {
+            return this.Control.CaptionAlign;
+        }
+        set
+        {
+            this.Control.CaptionAlign = value;
+        }
+    }
+
+    [Parameter]
+    public string Caption
+    {
+        get
+        {
+            return this.Control.Caption;
+        }
+        set
+        {
+            this.Control.Caption = value;
+        }
+    }
+
+    [Parameter]
+    public string BackImageUrl
+    {
+        get
+        {
+            return this.Control.BackImageUrl;
+        }
+        set
+        {
+            this.Control.BackImageUrl = value;
+        }
+    }
+
+    [Parameter]
+    public float? ItemSize
+    {
+        get
+        {
+            return this.Control.ItemSize;
+        }
+        set
+        {
+            this.Control.ItemSize = value;
+        }
+    }
+
+    [Parameter]
+    public int? OverscanCount
+    {
+        get
+        {
+            return this.Control.OverscanCount;
+        }
+        set
+        {
+            this.Control.OverscanCount = value;
+        }
+    }
+
+    [Parameter]
+    public int? MaxItemCount
+    {
+        get
+        {
+            return this.Control.MaxItemCount;
+        }
+        set
+        {
+            this.Control.MaxItemCount = value;
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,19 @@`
`467`	`467`	`}`
`468`	`468`	`}`
`469`	`469`
	`470`	`+ [Parameter]`
	`471`	`+ public bool AllowVirtualizing`
	`472`	`+ {`
	`473`	`+ get`
	`474`	`+ {`
	`475`	`+ return this.Control.AllowVirtualizing;`
	`476`	`+ }`
	`477`	`+ set`
	`478`	`+ {`
	`479`	`+ this.Control.AllowVirtualizing = value;`
	`480`	`+ }`
	`481`	`+ }`
	`482`	`+`
`470`	`483`	`protected override void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)`
`471`	`484`	`{`
`472`	`485`	`if (parameters.TryGetValue(nameof(this.EditIndex), out object value1) && value1 is int editIndex)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected internal virtual void SetInnerProperty(IReadOnlyDictionary<string, obj`
`29`	`29`
`30`	`30`	`protected internal virtual void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)`
`31`	`31`	`{`
`32`		`- this.Component.SetInnerProperty(parameters);`
	`32`	`+ this.Component.SetInnerPropertyWithCascading(parameters);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`protected internal virtual void OnAfterRender()`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,19 @@`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ [Parameter]`
	`205`	`+ public bool AllowVirtualizing`
	`206`	`+ {`
	`207`	`+ get`
	`208`	`+ {`
	`209`	`+ return this.Control.AllowVirtualizing;`
	`210`	`+ }`
	`211`	`+ set`
	`212`	`+ {`
	`213`	`+ this.Control.AllowVirtualizing = value;`
	`214`	`+ }`
	`215`	`+ }`
	`216`	`+`
`204`	`217`	`protected override void SetInnerPropertyWithCascading(IReadOnlyDictionary<string, object> parameters)`
`205`	`218`	`{`
`206`	`219`	`if (parameters.TryGetValue(nameof(this.EditIndex), out object value1) && value1 is int editIndex)`