Browse Source

Revert "Add dataFormat option to the datatables column definitions."

This reverts commit 6844245e9c.
pull/4639/head
maliming 6 years ago
parent
commit
3a84b6bae8
  1. 26
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

26
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

@ -299,11 +299,6 @@
column.targets = i; column.targets = i;
} }
if (!column.render && column.dataFormat){
var render = datatables.defaultRenderers[column.dataFormat];
column.render = render ? render : ISOStringToDateTimeLocaleString(column.dataFormat);
}
if (column.rowAction) { if (column.rowAction) {
customizeRowActionColumn(column); customizeRowActionColumn(column);
} }
@ -335,23 +330,18 @@
} }
}; };
var ISOStringToDateTimeLocaleString = function (format) {
return function(data) {
var date = luxon
.DateTime
.fromISO(data, {
locale: abp.localization.currentCulture.name
});
return format ? date.toLocaleString(format) : date.toLocaleString();
};
};
datatables.defaultRenderers['date'] = function (value) { datatables.defaultRenderers['date'] = function (value) {
return (ISOStringToDateTimeLocaleString())(value); return luxon
.DateTime
.fromISO(value, { locale: abp.localization.currentCulture.name })
.toLocaleString();
}; };
datatables.defaultRenderers['datetime'] = function (value) { datatables.defaultRenderers['datetime'] = function (value) {
return (ISOStringToDateTimeLocaleString(luxon.DateTime.DATETIME_SHORT))(value); return luxon
.DateTime
.fromISO(value, { locale: abp.localization.currentCulture.name })
.toLocaleString(luxon.DateTime.DATETIME_SHORT);
}; };
/************************************************************************ /************************************************************************

Loading…
Cancel
Save