From b3e0170cc84f8c1ceade24fe246b904ecde80faf Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 4 Oct 2022 09:46:20 +0800 Subject: [PATCH] Support text as a callback method. Resolve #14205 --- .../datatables/datatables-extensions.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 f87b7c27b1..47e89dcaae 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 @@ -36,7 +36,7 @@ var abp = abp || {}; var $a = $(''); if (fieldItem.displayNameHtml) { - $a.html(fieldItem.text); + $a.html(abp.utils.isFunction(fieldItem.text) ? fieldItem.text(record, tableInstance) : fieldItem.text); } else { if (fieldItem.icon !== undefined && fieldItem.icon) { @@ -45,7 +45,7 @@ var abp = abp || {}; $a.append($("").addClass(fieldItem.iconClass + " me-1")); } - $a.append(htmlEncode(fieldItem.text)); + $a.append(htmlEncode(abp.utils.isFunction(fieldItem.text) ? fieldItem.text(record, tableInstance) : fieldItem.text)); } if (fieldItem.action) { @@ -81,14 +81,14 @@ var abp = abp || {}; var $button = $(''); if (firstItem.displayNameHtml) { - $button.html(firstItem.text); + $button.html(abp.utils.isFunction(firstItem.text) ? firstItem.text(record, tableInstance) : firstItem.text); } else { if (firstItem.icon !== undefined && firstItem.icon) { $button.append($("").addClass("fa fa-" + firstItem.icon + " me-1")); } else if (firstItem.iconClass) { $button.append($("").addClass(firstItem.iconClass + " me-1")); } - $button.append(htmlEncode(firstItem.text)); + $button.append(htmlEncode(abp.utils.isFunction(firstItem.text) ? firstItem.text(record, tableInstance) : firstItem.text)); } if (firstItem.enabled && !firstItem.enabled({ record: record, table: tableInstance })) { @@ -132,7 +132,7 @@ var abp = abp || {}; } if (field.text) { - $dropdownButton.append(htmlEncode(field.text)); + $dropdownButton.append(htmlEncode(abp.utils.isFunction(field.text) ? field.text(record, tableInstance) : field.text)); } else { $dropdownButton.append(htmlEncode(localize("DatatableActionDropdownDefaultText"))); } @@ -272,7 +272,7 @@ var abp = abp || {}; } }); - //Delay for processing indicator + //Delay for processing indicator var defaultDelayForProcessingIndicator = 500; var _existingDefaultFnPreDrawCallback = $.fn.dataTable.defaults.fnPreDrawCallback; $.extend(true,