Merge branch 'master' of https://github.com/ekondur/DatatableJS

ekondur · Jan 13, 2022 · 5e648a4 · 5e648a4
2 parents 5722e9f + 613a625
commit 5e648a4
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 5 deletions.
diff --git a/DatatableJS.Net/Builders/GridBuilder.cs b/DatatableJS.Net/Builders/GridBuilder.cs
@@ -29,6 +29,7 @@ public class GridBuilder<T>
         internal List<int> _lengthMenuValues { get; private set; } = new List<int>();
         internal List<string> _lengthMenuDisplayedTexts { get; private set; } = new List<string>();
         internal int? _pageLength { get; private set; }
+        internal bool _processing { get; private set; } = true;
 
         internal List<ColumnDefinition> _columns = new List<ColumnDefinition>();
         internal List<FilterDefinition> _filters = new List<FilterDefinition>();
@@ -318,5 +319,16 @@ public GridBuilder<T> PageLength(int value)
             }
             return this;
         }
+
+        /// <summary>
+        /// Enable or disable the display of a 'processing' indicator when the table is being processed, Default is true.
+        /// </summary>
+        /// <param name="processing"></param>
+        /// <returns></returns>
+        public GridBuilder<T> Processing(bool processing)
+        {
+            _processing = processing;
+            return this;
+        }
     }
 }
diff --git a/DatatableJS.Net/JSHelper.cs b/DatatableJS.Net/JSHelper.cs
@@ -103,10 +103,10 @@ public static MvcHtmlString Render<T>(this GridBuilder<T> gridBuilder)
                     $(document).ready(function () {{
                         $('#{gridBuilder._name}').DataTable( {{
                             {tfootInit}
-                            processing:true,
+                            processing:{gridBuilder._processing.ToLowString()},
                             serverSide:{gridBuilder._serverSide.ToLowString()},
                             fixedColumns: {{ 
-                                lJStColumns: {gridBuilder._leftColumns},
+                                leftColumns: {gridBuilder._leftColumns},
                                 rightColumns: {gridBuilder._rightColumns}
                             }},
                             order: [{(!gridBuilder._ordering ? string.Empty : string.Join(", ", gridBuilder._orders.Select(a => $@"[{ a.Column}, '{(a.OrderBy == OrderBy.Ascending ? "asc" : "desc")}']")))}],

diff --git a/DatatableJS/Builders/GridBuilder.cs b/DatatableJS/Builders/GridBuilder.cs
@@ -29,6 +29,7 @@ public class GridBuilder<T>
         internal List<int> _lengthMenuValues { get; private set; } = new List<int>();
         internal List<string> _lengthMenuDisplayedTexts { get; private set; } = new List<string>();
         internal int? _pageLength { get; private set; }
+        internal bool _processing { get; private set; } = true;
 
         internal List<ColumnDefinition> _columns = new List<ColumnDefinition>();
         internal List<FilterModel> _filters = new List<FilterModel>();
@@ -318,5 +319,16 @@ public GridBuilder<T> PageLength(int value)
             }
             return this;
         }
+
+        /// <summary>
+        /// Enable or disable the display of a 'processing' indicator when the table is being processed, Default is true.
+        /// </summary>
+        /// <param name="processing"></param>
+        /// <returns></returns>
+        public GridBuilder<T> Processing(bool processing)
+        {
+            _processing = processing;
+            return this;
+        }
     }
 }
diff --git a/DatatableJS/Helpers/GridHelper.cs b/DatatableJS/Helpers/GridHelper.cs
@@ -23,6 +23,11 @@ public class GridHelper : TagHelper
         /// </summary>
         public bool Searching { get; set; } = true;
 
+        /// <summary>
+        /// Enable or disable the display of a 'processing' indicator when the table is being processed, Default is true.
+        /// </summary>
+        public bool Processing { get; set; } = true;
+
         /// <summary>
         /// Process
         /// </summary>
@@ -41,6 +46,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
                 Name = Name,
                 Ordering = Ordering,
                 Searching = Searching,
+                Processing = Processing
             };
 
             context.Items.Add("DataGrid", grid);

diff --git a/DatatableJS/Helpers/RenderHelper.cs b/DatatableJS/Helpers/RenderHelper.cs
@@ -29,7 +29,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
             var script = $@"
             $(document).ready(function () {{
                 $('#{grid.Name}').DataTable( {{
-                    processing:true,
+                    processing:{grid.Processing.ToLowString()},
                     serverSide:{grid.DataSource.ServerSide.ToLowString()},
                     fixedColumns: {{ 
                         leftColumns: {grid.FixedColumns?.LeftColumns},

diff --git a/DatatableJS/JSHelper.cs b/DatatableJS/JSHelper.cs
@@ -98,10 +98,10 @@ public static IHtmlContent Render<T>(this GridBuilder<T> gridBuilder)
                     $(document).ready(function () {{
                         $('#{gridBuilder._name}').DataTable( {{
                             {tfootInit}
-                            processing:true,
+                            processing:{gridBuilder._processing.ToLowString()},
                             serverSide:{gridBuilder._serverSide.ToLowString()},
                             fixedColumns: {{ 
-                                lJStColumns: {gridBuilder._leftColumns},
+                                leftColumns: {gridBuilder._leftColumns},
                                 rightColumns: {gridBuilder._rightColumns}
                             }},
                             order: [{(!gridBuilder._ordering ? string.Empty : string.Join(", ", gridBuilder._orders.Select(a => $@"[{ a.Column}, '{(a.OrderBy == OrderBy.Ascending ? "asc" : "desc")}']")))}],

diff --git a/DatatableJS/Models/GridModel.cs b/DatatableJS/Models/GridModel.cs
@@ -7,6 +7,7 @@ public class GridModel
         public string Name { get; set; }
         public bool Ordering { get; set; }
         public bool Searching { get; set; }
+        public bool Processing { get; set; }
 
         public List<ColumnModel> Columns { get; set; }
         public List<FilterModel> Filters { get; set; }