Compatible with older dataTables versions.

abpframework · Mar 19, 2024 · 06e4cfd · 06e4cfd
1 parent 48fda66
commit 06e4cfd
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/...kages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs b/...kages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs
@@ -10,6 +10,14 @@ public class DatatablesNetScriptContributor : BundleContributor
 {
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
-        context.Files.AddIfNotContains("/libs/datatables.net/js/dataTables.min.js");
+        if (context.FileProvider.GetFileInfo("/libs/datatables.net/js/dataTables.min.js").Exists)
+        {
+            context.Files.AddIfNotContains("/libs/datatables.net/js/dataTables.min.js");
+        }
+        else
+        {
+            //TODO: Compatibility code, Remove it after 8.2 rc1.
+            context.Files.AddIfNotContains("/libs/datatables.net/js/jquery.dataTables.js");
+        }
     }
 }
diff --git a/...hared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/...hared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@@ -11,6 +11,10 @@ var abp = abp || {};
      * RECORD-ACTIONS extension for datatables                               *
      *************************************************************************/
     (function () {
+        if (!$.fn.dataTableExt) {
+            return;
+        }
+
         var getVisibilityValue = function (visibilityField, record, tableInstance) {
             if (visibilityField === undefined) {
                 return true;
@@ -234,9 +238,17 @@ var abp = abp || {};
         var renderRowActions = function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) {
             var columns;
 
-            var settings = tableInstance.api().settings();
-            if (settings.length === 1 && settings[0].aoColumns) {
-                columns = settings[0].aoColumns;
+            if (tableInstance.aoColumns) {
+                columns = tableInstance.aoColumns;
+            } else if (abp.utils.isFunction(tableInstance.fnSettings)) {
+                columns = tableInstance.fnSettings().aoColumns;
+            }
+
+            if (!columns && abp.utils.isFunction(tableInstance.api)) {
+                var settings = tableInstance.api().settings();
+                if (settings.length === 1 && settings[0].aoColumns) {
+                    columns = settings[0].aoColumns;
+                }
             }
 
             if (!columns) {
@@ -266,6 +278,18 @@ var abp = abp || {};
             }
         };
 
+        if ($.fn.dataTableExt.oApi) {
+            var _existingApiRenderRowActionsFunction = $.fn.dataTableExt.oApi.renderRowActions;
+            $.fn.dataTableExt.oApi.renderRowActions =
+            function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) {
+                if (_existingApiRenderRowActionsFunction) {
+                    _existingApiRenderRowActionsFunction(tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull);
+                }
+
+                renderRowActions(tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull);
+            };
+        }
+
         if (!$.fn.dataTable) {
             return;
         }
@@ -451,10 +475,6 @@ var abp = abp || {};
                 if (column.rowAction) {
                     customizeRowActionColumn(column);
                 }
-
-                if (!column.type) {
-                    column.type = "string";
-                }
             }
 
             configuration.language = datatables.defaultConfigurations.language();