New SetTextArea method for the column definition

gustavnavar · Mar 17, 2022 · 189cdf6 · 189cdf6
1 parent 6ff10ca
commit 189cdf6
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 27 deletions.
diff --git a/GridBlazor/Columns/GridColumnBase.cs b/GridBlazor/Columns/GridColumnBase.cs
@@ -97,6 +97,8 @@ public abstract class GridColumnBase<T> : GridStyledColumn, IGridColumn<T>, IExp
 
         public InputType InputType { get; protected set; }
 
+        public int TextAreaRows { get; set; } = 5;
+
         public bool MultipleInput { get; protected set; } = false;
 
         public bool ToggleSwitch { get; protected set; } = false;
@@ -625,6 +627,17 @@ public IGridColumn<T> SetInputType(InputType inputType)
             return this;
         }
 
+        public IGridColumn<T> SetTextArea()
+        {
+            return SetInputType(InputType.TextArea);
+        }
+
+        public IGridColumn<T> SetTextArea(int rows)
+        {
+            TextAreaRows = rows;
+            return SetTextArea();
+        }
+
         public IGridColumn<T> SetInputFileType(bool? multiple = null)
         {
             IsSelectField = (false, null, null, null, null);

diff --git a/GridBlazor/GridBlazor.csproj b/GridBlazor/GridBlazor.csproj
@@ -6,7 +6,7 @@
     <LangVersion>8.0</LangVersion>
     <GenerateEmbeddedFilesManifest>True</GenerateEmbeddedFilesManifest>
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
-    <Version>3.2.1</Version>
+    <Version>3.2.2</Version>
     <Title>GridBlazor</Title>
     <Description>Grid components for Blazor</Description>
     <Summary>Grid components for Blazor</Summary>
@@ -48,7 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Agno.BlazorInputFile" Version="0.3.0" />
+    <PackageReference Include="Agno.BlazorInputFile" Version="0.4.0" />
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.11" />
   </ItemGroup>
 

diff --git a/GridBlazor/Pages/GridCreateComponent.razor b/GridBlazor/Pages/GridCreateComponent.razor
@@ -68,7 +68,7 @@
                                 </select>
                                 <span class="field-validation-error">
                                     <span>@ColumnErrors.Get(column.FieldName)</span>
-                                </span>              
+                                </span>
                             }
                         }
                         else if (((IGridColumn<T>)column).IsSelectColumn.IsSelectKey)
@@ -147,7 +147,7 @@
                                 }
                                 else if (type == typeof(string) && ((IGridColumn<T>)column).InputType == InputType.TextArea)
                                 {
-                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control" rows="5" readonly="readonly" value="@column.GetFormatedValue(value)" />
+                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control" rows="@column.TextAreaRows" readonly="readonly" value="@column.GetFormatedValue(value)" />
                                 }
                                 else
                                 {
@@ -162,7 +162,7 @@
                                 }
                                 else if (type == typeof(string) && ((IGridColumn<T>)column).InputType == InputType.TextArea)
                                 {
-                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control @(ColumnErrors.ContainsKey(@column.FieldName) ? "input-validation-error" : "")" rows="5" value="@column.GetFormatedValue(value)" @onchange="(e) => ChangeValue(e, column)" />
+                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control @(ColumnErrors.ContainsKey(@column.FieldName) ? "input-validation-error" : "")" rows="@column.TextAreaRows" value="@column.GetFormatedValue(value)" @onchange="(e) => ChangeValue(e, column)" />
                                 }
                                 else if (((IGridColumn<T>)column).InputType == InputType.File)
                                 {

diff --git a/GridBlazor/Pages/GridDeleteComponent.razor b/GridBlazor/Pages/GridDeleteComponent.razor
@@ -86,7 +86,7 @@
                     {
                         if (((IGridColumn<T>)column).InputType == InputType.TextArea)
                         {
-                            <textarea id="@column.FieldName" class="form-control" rows="5" readonly="readonly" value="@column.GetFormatedValue(value)" />
+                            <textarea id="@column.FieldName" class="form-control" rows="@column.TextAreaRows" readonly="readonly" value="@column.GetFormatedValue(value)" />
                         }
                         else
                         {

diff --git a/GridBlazor/Pages/GridReadComponent.razor b/GridBlazor/Pages/GridReadComponent.razor
@@ -85,7 +85,7 @@
                     {
                         if (((IGridColumn<T>)column).InputType == InputType.TextArea)
                         {
-                            <textarea id="@column.FieldName" class="form-control" rows="5" readonly="readonly" value="@column.GetFormatedValue(value)" />
+                            <textarea id="@column.FieldName" class="form-control" rows="@column.TextAreaRows" readonly="readonly" value="@column.GetFormatedValue(value)" />
                         }
                         else
                         {

diff --git a/GridBlazor/Pages/GridUpdateComponent.razor b/GridBlazor/Pages/GridUpdateComponent.razor
@@ -151,7 +151,7 @@
                                 }
                                 else if (type == typeof(string) && ((IGridColumn<T>)column).InputType == InputType.TextArea)
                                 {
-                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control" rows="5" readonly="readonly" value="@column.GetFormatedValue(value)" />
+                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control" rows="@column.TextAreaRows" readonly="readonly" value="@column.GetFormatedValue(value)" />
                                 }
                                 else
                                 {
@@ -162,7 +162,7 @@
                             {
                                 if (type == typeof(string) && ((IGridColumn<T>)column).InputType == InputType.TextArea)
                                 {
-                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control @(ColumnErrors.ContainsKey(@column.FieldName) ? "input-validation-error" : "")" rows="5" value="@column.GetFormatedValue(value)" @onchange="(e) => ChangeValue(e, column)" />
+                                    <textarea id="@column.FieldName" name="@column.FieldName" class="form-control @(ColumnErrors.ContainsKey(@column.FieldName) ? "input-validation-error" : "")" rows="@column.TextAreaRows" value="@column.GetFormatedValue(value)" @onchange="(e) => ChangeValue(e, column)" />
                                 }
                                 else if (((IGridColumn<T>)column).InputType == InputType.File)
                                 {

diff --git a/GridBlazorClientSide.Client/ColumnCollections/ColumnCollections.cs b/GridBlazorClientSide.Client/ColumnCollections/ColumnCollections.cs
@@ -913,7 +913,7 @@ public class ColumnCollections
             c.Add(o => o.HomePhone, true);
             c.Add(o => o.Extension, true);
             c.Add(o => o.ReportsTo, true);
-            c.Add(o => o.Notes, true).SetInputType(InputType.TextArea);
+            c.Add(o => o.Notes, true).SetTextArea(8);
             c.Add(o => o.PhotoPath, true);
             c.Add(true, "PhotoFile").Titled("Photo").SetInputFileType();
         };

diff --git a/GridBlazorClientSide.Client/GridBlazorClientSide.Client.csproj b/GridBlazorClientSide.Client/GridBlazorClientSide.Client.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.1</Version>
+    <Version>3.2.2</Version>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 

diff --git a/GridBlazorOData.Client/GridBlazorOData.Client.csproj b/GridBlazorOData.Client/GridBlazorOData.Client.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.1</Version>
+    <Version>3.2.2</Version>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 

diff --git a/GridBlazorOData.Client/Pages/EmployeeComponent.razor b/GridBlazorOData.Client/Pages/EmployeeComponent.razor
@@ -64,7 +64,7 @@ else
             c.Add(o => o.HomePhone, true);
             c.Add(o => o.Extension, true);
             c.Add(o => o.ReportsTo, true);
-            c.Add(o => o.Notes, true).SetInputType(InputType.TextArea);
+            c.Add(o => o.Notes, true).SetTextArea(8);
             c.Add(o => o.PhotoPath, true);
             c.Add(true, "PhotoFile").Titled("Photo").SetInputFileType();
         };

diff --git a/GridBlazorServerSide/ColumnCollections/ColumnCollections.cs b/GridBlazorServerSide/ColumnCollections/ColumnCollections.cs
@@ -919,7 +919,7 @@ public class ColumnCollections
             c.Add(o => o.HomePhone, true);
             c.Add(o => o.Extension, true);
             c.Add(o => o.ReportsTo, true);
-            c.Add(o => o.Notes, true).SetInputType(InputType.TextArea);
+            c.Add(o => o.Notes, true).SetTextArea(8);
             c.Add(o => o.PhotoPath, true);
             c.Add(true, "PhotoFile").Titled("Photo").SetInputFileType();
         };

diff --git a/GridBlazorServerSide/GridBlazorServerSide.csproj b/GridBlazorServerSide/GridBlazorServerSide.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.1</Version>
+    <Version>3.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GridBlazorStandalone/ColumnCollections/ColumnCollections.cs b/GridBlazorStandalone/ColumnCollections/ColumnCollections.cs
@@ -919,7 +919,7 @@ public class ColumnCollections
             c.Add(o => o.HomePhone, true);
             c.Add(o => o.Extension, true);
             c.Add(o => o.ReportsTo, true);
-            c.Add(o => o.Notes, true).SetInputType(InputType.TextArea);
+            c.Add(o => o.Notes, true).SetTextArea(8);
             c.Add(o => o.PhotoPath, true);
             c.Add(true, "PhotoFile").Titled("Photo").SetInputFileType();
         };

diff --git a/GridBlazorStandalone/GridBlazorStandalone.csproj b/GridBlazorStandalone/GridBlazorStandalone.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>3.1.1</Version>
+    <Version>3.2.2</Version>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
   </PropertyGroup>
 

diff --git a/GridCore/Columns/GridCoreColumnBase.cs b/GridCore/Columns/GridCoreColumnBase.cs
@@ -100,6 +100,8 @@ public abstract class GridCoreColumnBase<T> : GridStyledColumn, IGridColumn<T>,
 
         public InputType InputType { get; protected set; }
 
+        public int TextAreaRows { get; set; } = 5;
+
         public bool MultipleInput { get; protected set; } = false;
 
         public bool ToggleSwitch { get; protected set; } = false;
@@ -628,6 +630,17 @@ public IGridColumn<T> SetInputType(InputType inputType)
             return this;
         }
 
+        public IGridColumn<T> SetTextArea()
+        {
+            return SetInputType(InputType.TextArea);
+        }
+
+        public IGridColumn<T> SetTextArea(int rows)
+        {
+            TextAreaRows = rows;
+            return SetTextArea();
+        }
+
         public IGridColumn<T> SetInputFileType(bool? multiple = null)
         {
             IsSelectField = (false, null, null, null, null);

diff --git a/GridCore/GridCore.csproj b/GridCore/GridCore.csproj
@@ -7,7 +7,7 @@
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
     <Product>GridCore</Product>
     <PackageId>GridCore</PackageId>
-    <Version>5.2.1</Version>
+    <Version>5.2.2</Version>
     <Title>GridCore</Title>
     <Description>Grid core component</Description>
     <Summary>Grid core component</Summary>

diff --git a/GridMvc.Demo/BlazorComponents/EmployeeComponent.razor b/GridMvc.Demo/BlazorComponents/EmployeeComponent.razor
@@ -65,7 +65,7 @@ else
             c.Add(o => o.HomePhone, true);
             c.Add(o => o.Extension, true);
             c.Add(o => o.ReportsTo, true);
-            c.Add(o => o.Notes, true).SetInputType(InputType.TextArea);
+            c.Add(o => o.Notes, true).SetTextArea(8);
             c.Add(o => o.PhotoPath, true);
             c.Add(true, "PhotoFile").Titled("Photo").SetInputFileType();
         };

diff --git a/GridMvc.Demo/GridMvc.Demo.csproj b/GridMvc.Demo/GridMvc.Demo.csproj
@@ -5,7 +5,7 @@
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
-    <Version>5.0.3</Version>
+    <Version>5.2.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/GridMvc/GridMvc.csproj b/GridMvc/GridMvc.csproj
@@ -8,7 +8,7 @@
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
     <Product>GridMvc</Product>
     <PackageId>GridMvcCore</PackageId>
-    <Version>5.2.1</Version>
+    <Version>5.2.2</Version>
     <Title>GridMvc</Title>
     <Description>ASP.NET MVC Grid component</Description>
     <Summary>ASP.NET MVC Grid component</Summary>

diff --git a/GridShared/Columns/IGridColumn.cs b/GridShared/Columns/IGridColumn.cs
@@ -58,6 +58,7 @@ public interface IGridColumn : ISortableColumn, IFilterableColumn
         string TrueLabel { get; }
         string FalseLabel { get; }
         InputType InputType { get; }
+        int TextAreaRows { get; }
         void SetGroupLabel(Func<object, Task<string>> function);
     }
 
@@ -424,6 +425,16 @@ public interface IColumn<T>
         /// </summary>
         IGridColumn<T> SetInputType(InputType inputType);
 
+        /// <summary>
+        ///     Sets the column input type to type area for CRUD components
+        /// </summary>
+        IGridColumn<T> SetTextArea();
+
+        /// <summary>
+        ///     Sets the column input type type area for CRUD components
+        /// </summary>
+        IGridColumn<T> SetTextArea(int rows);
+
         /// <summary>
         ///     Sets the column input type for CRUD components
         /// </summary>

diff --git a/GridShared/GridShared.csproj b/GridShared/GridShared.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
-    <Version>5.2.1</Version>
+    <Version>5.2.2</Version>
     <Title>GridShared</Title>
     <Description>Support library for GridBlazor and GridMvcCore component libraries</Description>
     <Summary>Support library for GridBlazor and GridMvcCore component libraries</Summary>

diff --git a/docs/blazor_client/Crud.md b/docs/blazor_client/Crud.md
@@ -267,13 +267,18 @@ You can also configure the "read only on create" and/or "read only on update" be
 
 If a column is a date that has to be shown as ```date```, ```time```, ```week```, ```month``` or ```datetime-local``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct format.
 
-If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct html element.
+If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetTextArea** or the  **SetInputType** method in order to get the correct html element.
 
 The **SetInputType** method has 1 required parameter:
 Parameter | Description
 --------- | -----------
 inputType | ```InputType``` enum. Its value can be ```InputType.TextArea```, ```InputType.Date```, ```InputType.Time```, ```InputType.Month```, ```InputType.Week``` or ```InputType.DateTimeLocal```
 
+The **SetTextArea** method has 1 optional parameter:
+Parameter | Description
+--------- | -----------
+rows | integer to select the number or rows of the ```<textarea>``` element
+
 You can also add components on the CRUD forms using the ```RenderCrudComponentAs<TComponent>``` method. You must define these columns as **Hidden** to show them just on CRUD forms.
 
 You can configure the width of the column input element using the ```SetCrudWidth(int width)``` and ```SetCrudWidth(int width, int labelWidtth)``` methods. The default value for the column width is 5 and and for the label width is 2. You can configure them from 1 to 11, but the sum of both can not be more than 12.

diff --git a/docs/blazor_local/Crud.md b/docs/blazor_local/Crud.md
@@ -160,13 +160,18 @@ You can also configure the "read only on create" and/or "read only on update" be
 
 If a column is a date that has to be shown as ```date```, ```time```, ```week```, ```month``` or ```datetime-local``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct format.
 
-If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct html element.
+If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetTextArea** or the  **SetInputType** method in order to get the correct html element.
 
 The **SetInputType** method has 1 required parameter:
 Parameter | Description
 --------- | -----------
 inputType | ```InputType``` enum. Its value can be ```InputType.TextArea```, ```InputType.Date```, ```InputType.Time```, ```InputType.Month```, ```InputType.Week``` or ```InputType.DateTimeLocal```
 
+The **SetTextArea** method has 1 optional parameter:
+Parameter | Description
+--------- | -----------
+rows | integer to select the number or rows of the ```<textarea>``` element
+
 You can also add components on the CRUD forms using the ```RenderCrudComponentAs<TComponent>``` method. You must define these columns as **Hidden** to show them just on CRUD forms.
 
 You can configure the width of the column input element using the ```SetCrudWidth(int width)``` and ```SetCrudWidth(int width, int labelWidtth)``` methods. The default value for the column width is 5 and and for the label width is 2. You can configure them from 1 to 11, but the sum of both can not be more than 12.

diff --git a/docs/blazor_odata/Crud.md b/docs/blazor_odata/Crud.md
@@ -202,13 +202,18 @@ You can also configure the "read only on create" and/or "read only on update" be
 
 If a column is a date that has to be shown as ```date```, ```time```, ```week```, ```month``` or ```datetime-local``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct format.
 
-If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct html element.
+If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetTextArea** or the  **SetInputType** method in order to get the correct html element.
 
 The **SetInputType** method has 1 required parameter:
 Parameter | Description
 --------- | -----------
 inputType | ```InputType``` enum. Its value can be ```InputType.TextArea```, ```InputType.Date```, ```InputType.Time```, ```InputType.Month```, ```InputType.Week``` or ```InputType.DateTimeLocal```
 
+The **SetTextArea** method has 1 optional parameter:
+Parameter | Description
+--------- | -----------
+rows | integer to select the number or rows of the ```<textarea>``` element
+
 You can also add components on the CRUD forms using the ```RenderCrudComponentAs<TComponent>``` method. You must define these columns as **Hidden** to show them just on CRUD forms.
 
 You can configure the width of the column input element using the ```SetCrudWidth(int width)``` and ```SetCrudWidth(int width, int labelWidtth)``` methods. The default value for the column width is 5 and and for the label width is 2. You can configure them from 1 to 11, but the sum of both can not be more than 12.

diff --git a/docs/blazor_server/Crud.md b/docs/blazor_server/Crud.md
@@ -160,13 +160,18 @@ You can also configure the "read only on create" and/or "read only on update" be
 
 If a column is a date that has to be shown as ```date```, ```time```, ```week```, ```month``` or ```datetime-local``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct format.
 
-If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetInputType** method in order to get the correct html element.
+If a column is a string that has to be shown as ```<textarea>``` in the CRUD forms, the column definition should use the  **SetTextArea** or the  **SetInputType** method in order to get the correct html element.
 
 The **SetInputType** method has 1 required parameter:
 Parameter | Description
 --------- | -----------
 inputType | ```InputType``` enum. Its value can be ```InputType.TextArea```, ```InputType.Date```, ```InputType.Time```, ```InputType.Month```, ```InputType.Week``` or ```InputType.DateTimeLocal```
 
+The **SetTextArea** method has 1 optional parameter:
+Parameter | Description
+--------- | -----------
+rows | integer to select the number or rows of the ```<textarea>``` element
+
 You can also add components on the CRUD forms using the ```RenderCrudComponentAs<TComponent>``` method. You must define these columns as **Hidden** to show them just on CRUD forms.
 
 You can configure the width of the column input element using the ```SetCrudWidth(int width)``` and ```SetCrudWidth(int width, int labelWidtth)``` methods. The default value for the column width is 5 and and for the label width is 2. You can configure them from 1 to 11, but the sum of both can not be more than 12.