From 328157a0e03abae6deabd850f47b3b8e07e8f383 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Fri, 14 Jun 2024 09:51:58 +0800
Subject: [PATCH] Make `DateTimeExtensionProperty` support
 `DisplayFormatAttribute`.

Resolve #20037
---
 ...oriseUiObjectExtensionPropertyInfoExtensions.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs
index a3cd7372a6..2773b88bed 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiObjectExtensionPropertyInfoExtensions.cs
@@ -46,6 +46,12 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions
 
     public static string? GetDateEditInputFormatOrNull(this IBasicObjectExtensionPropertyInfo property)
     {
+        var dataFormatString = property.GetDataFormatStringOrNull();
+        if (dataFormatString != null)
+        {
+            return dataFormatString;
+        }
+
         if (property.IsDate())
         {
             return "{0:yyyy-MM-dd}";
@@ -59,6 +65,14 @@ public static class BlazoriseUiObjectExtensionPropertyInfoExtensions
         return null;
     }
 
+    public static string? GetDataFormatStringOrNull(this IBasicObjectExtensionPropertyInfo property)
+    {
+        return property
+            .Attributes
+            .OfType<DisplayFormatAttribute>()
+            .FirstOrDefault()?.DataFormatString;
+    }
+
     public static string? GetTextInputValueOrNull(this IBasicObjectExtensionPropertyInfo property, object? value)
     {
         if (value == null)