Merge branch 'dev' into identity-installer

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/ObjectExtending/MvcUiObjectExtensionPropertyInfoExtensions.cs

@@ -37,6 +37,13 @@ namespace Volo.Abp.ObjectExtending
 
         public static string GetInputFormatOrNull(this IBasicObjectExtensionPropertyInfo property)
         {
+            var formatString = property.GetDataFormatStringOrNull();
+
+            if (!formatString.IsNullOrWhiteSpace())
+            {
+                return formatString;
+            }
+
             if (property.IsDate())
             {
                 return "{0:yyyy-MM-dd}";

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoAspNetCoreMvcExtensions.cs

@@ -33,5 +33,13 @@ namespace Volo.Abp.ObjectExtending
                 .OfType<DataTypeAttribute>()
                 .FirstOrDefault()?.DataType;
         }
+
+        public static string GetDataFormatStringOrNull(this IBasicObjectExtensionPropertyInfo property)
+        {
+            return property
+                .Attributes
+                .OfType<DisplayFormatAttribute>()
+                .FirstOrDefault()?.DataFormatString;
+        }
     }
 }

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/ApiDescriptionFinder.cs

@@ -37,7 +37,11 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             CancellationTokenProvider = NullCancellationTokenProvider.Instance;
         }
 
-        public async Task<ActionApiDescriptionModel> FindActionAsync(HttpClient client, string baseUrl, Type serviceType, MethodInfo method)
+        public async Task<ActionApiDescriptionModel> FindActionAsync(
+            HttpClient client,
+            string baseUrl,
+            Type serviceType,
+            MethodInfo method)
         {
             var apiDescription = await GetApiDescriptionAsync(client, baseUrl);
 
@@ -114,7 +118,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase
             });
 
-            return (ApplicationApiDescriptionModel)result;
+            return result;
         }
 
         protected virtual void AddHeaders(HttpRequestMessage requestMessage)

npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-table/extensible-table.component.html

@@ -26,8 +26,8 @@
       <ng-template let-row="row" let-i="index" ngx-datatable-cell-template>
         <ng-container *abpPermission="prop.permission">
           <div
-            *ngIf="row['_' + prop.name].visible"
-            [innerHTML]="row['_' + prop.name].value | async"
+            *ngIf="row['_' + prop.name]?.visible"
+            [innerHTML]="row['_' + prop.name]?.value | async"
             (click)="
               prop.action && prop.action({ getInjected: getInjected, record: row, index: i })
             "

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637553771559216839" rel="stylesheet"/>
+    <link href="global.css?_v=637649661149948696" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -23,7 +23,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637553771563227337"></script>
+    <script src="global.js?_v=637649661153988086"></script>
     <!--/ABP:Scripts-->
 
 </body>