From 6844245e9ca35177c0733c4de21db01b9ace2894 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 6 Jul 2020 14:20:16 +0800
Subject: [PATCH] Add dataFormat option to the datatables column definitions.

Resolve #4629
---
 .../datatables/datatables-extensions.js       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 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 824e376934..dd749d0bc1 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
@@ -299,6 +299,11 @@
                     column.targets = i;
                 }
 
+                if (!column.render && column.dataFormat){
+                    var render = datatables.defaultRenderers[column.dataFormat];
+                    column.render = render ? render : ISOStringToDateTimeLocaleString(column.dataFormat);
+                }
+
                 if (column.rowAction) {
                     customizeRowActionColumn(column);
                 }
@@ -330,18 +335,23 @@
         }
     };
 
+    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) {
-        return luxon
-            .DateTime
-            .fromISO(value, { locale: abp.localization.currentCulture.name })
-            .toLocaleString();
+        return (ISOStringToDateTimeLocaleString())(value);
     };
 
     datatables.defaultRenderers['datetime'] = function (value) {
-        return luxon
-            .DateTime
-            .fromISO(value, { locale: abp.localization.currentCulture.name })
-            .toLocaleString(luxon.DateTime.DATETIME_SHORT);
+        return (ISOStringToDateTimeLocaleString(luxon.DateTime.DATETIME_SHORT))(value);
     };
 
     /************************************************************************