Merge pull request #9250 from abpframework/auto-merge/rel-4-3/427

Merge branch dev with rel-4.3
4 years ago · 3d000b1fc6
parent 4d3a3fb355 bf9c8b03ec
commit 3d000b1fc6
1 changed files with 5 additions and 3 deletions
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@ -236,9 +236,11 @@ var abp = abp || {};
                    var $actionContainer = _createRowAction(aData, column.rowAction, tableInstance);
                    hideEmptyColumn($actionContainer, tableInstance, colIndex);

-                    var $actionButton = $(cells[colIndex]).find(".abp-action-button");
-                    if ($actionButton.length === 0) {
-                        $(cells[colIndex]).empty().append($actionContainer);
+                    if ($actionContainer) {
+                        var $actionButton = $(cells[colIndex]).find(".abp-action-button");
+                        if ($actionButton.length === 0) {
+                            $(cells[colIndex]).empty().append($actionContainer);
+                        }
                    }
                }
            }