Merge pull request #4709 from abpframework/maliming-patch-2

Fix some problems with the time zone function.

framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TZConvertTimezoneProvider.cs

@@ -10,7 +10,7 @@ namespace Volo.Abp.Timing
     {
         public virtual List<NameValue> GetWindowsTimezones()
         {
-            return TZConvert.KnownIanaTimeZoneNames.OrderBy(x => x).Select(x => new NameValue(x, x)).ToList();
+            return TZConvert.KnownWindowsTimeZoneIds.OrderBy(x => x).Select(x => new NameValue(x, x)).ToList();
         }
 
         public virtual List<NameValue> GetIanaTimezones()

npm/packs/core/src/abp.js

@@ -706,18 +706,18 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),