Merge pull request #142 from EasyAbp/abp-9.2

Upgrade to ABP 9.2.1

Author: gdlcf88

.github/workflows/publish-docs.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0

.github/workflows/publish.yml

@@ -7,11 +7,11 @@ on:
       - release
 jobs:
   publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: NuGet/setup-nuget@v1
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/checkout@v4
+      - uses: NuGet/setup-nuget@v2
+      - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '9.0.x'
 

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <AbpVersion>9.1.1</AbpVersion>
-    <EasyAbpAbpTagHelperPlusModuleVersion>2.5.0</EasyAbpAbpTagHelperPlusModuleVersion>
+    <AbpVersion>9.2.1</AbpVersion>
+    <EasyAbpAbpTagHelperPlusModuleVersion>2.6.0</EasyAbpAbpTagHelperPlusModuleVersion>
   </PropertyGroup>
 </Project>

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.6.0</Version>
+    <Version>5.7.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
@@ -28,3 +28,4 @@
 
 </Project>
 
+

host/EasyAbp.FileManagement.Blazor.Host/EasyAbp.FileManagement.Blazor.Host.csproj

@@ -10,8 +10,8 @@
   <ItemGroup>
     <PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.4" />
   </ItemGroup>
 
   <ItemGroup>

host/EasyAbp.FileManagement.Blazor.Server.Host/EasyAbp.FileManagement.Blazor.Server.Host.csproj

@@ -14,9 +14,9 @@
     <ItemGroup>
         <PackageReference Include="Blazorise.Bootstrap5" Version="1.6.2" />
         <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.6.2" />
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
-        <PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
+        <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
+        <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4" />
     </ItemGroup>
 
     <ItemGroup>

host/EasyAbp.FileManagement.Blazor.Server.Host/package.json

@@ -3,7 +3,7 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~4.1.1",
-    "@abp/aspnetcore.components.server.leptonxlitetheme": "~4.1.1"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~4.2.1",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "~4.2.1"
   }
 }

host/EasyAbp.FileManagement.Blazor.Server.Host/wwwroot/libs/abp/core/abp.js

@@ -81,19 +81,19 @@ var abp = abp || {};
         if (resource) {
             return resource;
         }
-        
+
         var legacySource = abp.localization.values[resourceName];
         if (legacySource) {
             return {
                 texts: abp.localization.values[resourceName],
                 baseResources: []
             };
         }
-        
-        abp.log.warn('Could not find localization source: ' + resourceName);        
+
+        abp.log.warn('Could not find localization source: ' + resourceName);
         return null;
     };
-    
+
     abp.localization.internal.localize = function (key, sourceName) {
         var resource = abp.localization.internal.getResource(sourceName);
         if (!resource){
@@ -104,7 +104,7 @@ var abp = abp || {};
         }
 
         var value = resource.texts[key];
-        if (value === undefined) {            
+        if (value === undefined) {
             for (var i = 0; i < resource.baseResources.length; i++){
                 var basedArguments = Array.prototype.slice.call(arguments, 0);
                 basedArguments[1] = resource.baseResources[i];
@@ -114,7 +114,7 @@ var abp = abp || {};
                     return result;
                 }
             }
-            
+
             return {
                 value: key,
                 found: false
@@ -135,7 +135,7 @@ var abp = abp || {};
         if (sourceName === '_') { //A convention to suppress the localization
             return key;
         }
-        
+
         if (sourceName) {
             return abp.localization.internal.localize.apply(this, arguments).value;
         }
@@ -750,7 +750,11 @@ var abp = abp || {};
 
     abp.clock.supportsMultipleTimezone = function () {
         return abp.clock.kind === 'Utc';
-    };
+    }
+
+    abp.clock.timeZone = function () {
+        return abp.setting.get('Abp.Timing.TimeZone') || abp.clock.browserTimeZone();
+    }
 
     // Normalize Date object or date string to standard string format that will be sent to server
     abp.clock.normalizeToString = function (date) {
@@ -763,32 +767,42 @@ var abp = abp || {};
             return date;
         }
 
-        if (abp.clock.kind === 'Utc') {
-            return dateObj.toISOString();
-        }
-
         function padZero(num) {
             return num < 10 ? '0' + num : num;
         }
 
-        function padMilliseconds(num) {
-            if (num < 10) return '00' + num;
-            if (num < 100) return '0' + num;
-            return num;
+        var addZulu = false;
+        if (abp.clock.supportsMultipleTimezone()) {
+            var timeZone = abp.clock.timeZone();
+            var now = new Date();
+            var formattedDate = now.toLocaleString('en-US', { timeZone: timeZone, timeZoneName: 'longOffset' });
+            var match = formattedDate.match(/GMT([+-]\d+)/);
+            var targetOffsetHours = match ? parseInt(match[1], 10) : 0;
+            dateObj = new Date(dateObj.getTime() - (targetOffsetHours * 60 * 60 * 1000));
+            addZulu = true;
         }
-        
-        // yyyy-MM-ddTHH:mm:ss.SSS
+
+        // yyyy-MM-DDTHH:mm:ss
         return dateObj.getFullYear() + '-' +
-                padZero(dateObj.getMonth() + 1) + '-' +
-                padZero(dateObj.getDate()) + 'T' +
-                padZero(dateObj.getHours()) + ':' +
-                padZero(dateObj.getMinutes()) + ':' +
-                padZero(dateObj.getSeconds()) + '.' +
-                padMilliseconds(dateObj.getMilliseconds());
+            padZero(dateObj.getMonth() + 1) + '-' +
+            padZero(dateObj.getDate()) + 'T' +
+            padZero(dateObj.getHours()) + ':' +
+            padZero(dateObj.getMinutes()) + ':' +
+            padZero(dateObj.getSeconds()) + (addZulu ? 'Z' : '');
+    };
+
+    // Default options for toLocaleString
+    abp.clock.toLocaleStringOptions = abp.clock.toLocaleStringOptions || {
+        "year": "numeric",
+        "month": "long",
+        "day": "numeric",
+        "hour": "numeric",
+        "minute": "numeric",
+        "second": "numeric"
     };
 
     // Normalize date string to locale date string that will be displayed to user
-    abp.clock.normalizeToLocaleString = function (dateString) {
+    abp.clock.normalizeToLocaleString = function (dateString, options) {
         if (!dateString) {
             return dateString;
         }
@@ -797,11 +811,36 @@ var abp = abp || {};
         if (isNaN(date)) {
             return dateString;
         }
-        
-        //TODO: Get timezone setting and pass it to toLocaleString
-        return date.toLocaleString();
+
+        var culture = abp.localization.currentCulture.cultureName;
+        options = options || abp.clock.toLocaleStringOptions;
+        if (abp.clock.supportsMultipleTimezone()) {
+            var timezone = abp.clock.timeZone();
+            if (timezone) {
+                return date.toLocaleString(culture, Object.assign({}, options, { timeZone: timezone }));
+            }
+        }
+        return date.toLocaleString(culture, options);
     }
 
+    abp.clock.browserTimeZone = function () {
+        return Intl.DateTimeFormat().resolvedOptions().timeZone;
+    }
+
+    abp.clock.trySetBrowserTimeZoneToCookie = true;
+
+    abp.clock.setBrowserTimeZoneToCookie = function () {
+        if (!abp.clock.trySetBrowserTimeZoneToCookie || !abp.clock.supportsMultipleTimezone()) {
+            return;
+        }
+
+        abp.utils.setCookieValue('__timezone', abp.clock.browserTimeZone(), new Date(new Date().setFullYear(new Date().getFullYear() + 1)), '/');
+    }
+
+    abp.event.on('abp.configurationInitialized', function () {
+        abp.clock.setBrowserTimeZoneToCookie();
+    });
+
     /* FEATURES *************************************************/
 
     abp.features = abp.features || {};

host/EasyAbp.FileManagement.Blazor.Server.Host/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -32,7 +32,7 @@ var abp = abp || {};
                 .fromFormat(
                     getObjectValue(form, field),
                     abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
-                    {locale: abp.localization.currentCulture.cultureName}
+                    { locale: abp.localization.currentCulture.cultureName }
                 );
 
             if (!dateTime.invalid) {
@@ -43,4 +43,60 @@ var abp = abp || {};
         return form;
     }
 
+    // Normalize Date object or date string to standard string format that will be sent to server
+    abp.clock.normalizeToString = function (date) {
+        if (!date) {
+            return date;
+        }
+
+        var dateObj = date instanceof Date ? date : new Date(date);
+        if (isNaN(dateObj)) {
+            return date;
+        }
+
+        var timeZone = abp.clock.timeZone();
+        if (abp.clock.supportsMultipleTimezone() && timeZone) {
+            return luxon.DateTime.fromObject({
+                year: dateObj.getFullYear(),
+                month: dateObj.getMonth() + 1,
+                day: dateObj.getDate(),
+                hour: dateObj.getHours(),
+                minute: dateObj.getMinutes(),
+                second: dateObj.getSeconds()
+            }, { zone: timeZone }).setZone("utc").toISO();
+        } else {
+            return luxon.DateTime.fromJSDate(dateObj).toFormat("yyyy-MM-dd'T'HH:mm:ss");
+        }
+    };
+
+    // Normalize date string to locale date string that will be displayed to user
+    abp.clock.normalizeToLocaleString = function (dateString, options) {
+        if (!dateString) {
+            return dateString;
+        }
+
+        var date = new Date(dateString);
+        if (isNaN(date)) {
+            return dateString;
+        }
+
+        options = options || abp.clock.toLocaleStringOptions;
+        if (abp.clock.supportsMultipleTimezone()) {
+            var timezone = abp.clock.timeZone();
+            if (timezone) {
+                return luxon.DateTime.fromJSDate(date)
+                    .setZone(timezone)
+                    .setLocale(abp.localization.currentCulture.cultureName)
+                    .toLocaleString(options);
+            }
+        }
+
+        return luxon.DateTime.fromJSDate(date)
+            .setLocale(abp.localization.currentCulture.cultureName)
+            .toLocaleString(options);
+    }
+
+    abp.clock.browserTimeZone = function () {
+        return luxon.DateTime.local().zoneName;
+    }
 })(jQuery);