From 8d1d2ef0832065770ba68aefed6a0050b57cb580 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 6 Dec 2023 16:57:48 +0800 Subject: [PATCH 1/2] Support `dropdowns-dividers` for `row acrions`. --- .../datatables/datatables-extensions.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git 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 index 19a109b884..01851aaa59 100644 --- 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 @@ -32,6 +32,12 @@ var abp = abp || {}; } var _createDropdownItem = function (record, fieldItem, tableInstance) { + if (fieldItem.divider) { + return $(fieldItem.dividerHtml ? + (abp.utils.isFunction(fieldItem.dividerHtml) ? fieldItem.dividerHtml(record, tableInstance) : fieldItem.dividerHtml) + : '
  • '); + } + var $li = $('
  • '); var $a = $('').addClass('dropdown-item'); From 35b18325a99142a55446d914bb795fb0ef847fdf Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 7 Dec 2023 09:03:57 +0800 Subject: [PATCH 2/2] Update datatables-extensions.js --- .../datatables/datatables-extensions.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git 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 index 01851aaa59..15d290fa37 100644 --- 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 @@ -33,9 +33,15 @@ var abp = abp || {}; var _createDropdownItem = function (record, fieldItem, tableInstance) { if (fieldItem.divider) { - return $(fieldItem.dividerHtml ? - (abp.utils.isFunction(fieldItem.dividerHtml) ? fieldItem.dividerHtml(record, tableInstance) : fieldItem.dividerHtml) - : '
  • '); + if (abp.utils.isFunction(fieldItem.divider)) { + return $(fieldItem.divider(record, tableInstance)); + } + + if (fieldItem.divider === true) { + return $('
  • '); + } + + return $(fieldItem.divider); } var $li = $('
  • ');