Merge pull request #189 from KorzhCom/dev

Version 1.5.5
KorzhCom · Apr 2, 2024 · 37c1693 · 37c1693
2 parents 2a7a2bb + 424f820
commit 37c1693
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/easydata.js/packs/core/src/i18n/i18n.ts b/easydata.js/packs/core/src/i18n/i18n.ts
@@ -430,9 +430,6 @@ export namespace i18n {
             else if (format == 'u') {
                 format = buildUniversalDateTimeFormat(dataType);
             }
-            else {
-                format = buildUniversalDateTimeFormat(dataType);
-            }
         }
         else {
             format = buildShortDateTimeFormat(dataType);

diff --git a/easydata.js/version.json b/easydata.js/version.json
@@ -1,6 +1,6 @@
 {
-    "version": "1.5.4",
-    "baseVersion": "1.5.4",
-    "assetVersion": "01_05_04",
+    "version": "1.5.5",
+    "baseVersion": "1.5.5",
+    "assetVersion": "01_05_05",
     "tag": "latest" 
 }
diff --git a/easydata.net/src/EasyData.Core/DisplayFormatStore.cs b/easydata.net/src/EasyData.Core/DisplayFormatStore.cs
@@ -45,6 +45,11 @@ public DisplayFormatDescriptor AddOrUpdate(DataType type, string name, string fo
                 desc = new DisplayFormatDescriptor(name, format);
                 desc.IsDefault = isDefault;
                 if (_dict.TryGetValue(type, out var formats)) {
+                    if (isDefault) {
+                        foreach (var fmt in formats) {
+                            fmt.IsDefault = false;
+                        }
+                    }
                     formats.Add(desc);
                 }
                 else {

diff --git a/easydata.net/src/EasyData.Core/MetaData.cs b/easydata.net/src/EasyData.Core/MetaData.cs
@@ -1049,6 +1049,7 @@ protected virtual async Task ReadOneModelPropFromJsonAsync(JsonReader reader, st
                     await Editors.ReadFromJsonAsync(reader, ct).ConfigureAwait(false);
                     break;
                 case "dataFormats":
+                case "displayFormats":
                     await reader.ReadAsync(ct).ConfigureAwait(false); //reading StartObject token
                     await ReadDisplayFormatsFromJsonAsync(reader, ct).ConfigureAwait(false);
                     break;
@@ -1071,7 +1072,7 @@ protected async virtual Task ReadDisplayFormatsFromJsonAsync(JsonReader reader,
                 var formatType = reader.Value.ToString().StrToDataType();
 
                 await reader.ReadAsync(ct).ConfigureAwait(false);
-                if (reader.TokenType != JsonToken.StartArray) {
+                if (reader.TokenType == JsonToken.StartArray) {
                     while ((await reader.ReadAsync(ct).ConfigureAwait(false))
                         && reader.TokenType != JsonToken.EndArray)
                     {

diff --git a/easydata.net/version.json b/easydata.net/version.json
@@ -1,5 +1,5 @@
 {
-    "assemblyVersion": "1.5.3.1",
-    "packageVersion": "1.5.3",
-    "assetVersion": "01_05_03"
+    "assemblyVersion": "1.5.5.1",
+    "packageVersion": "1.5.5",
+    "assetVersion": "01_05_05"
 }