Merge pull request #138 from KorzhCom/dev

Version 1.4.6
KorzhCom · May 25, 2022 · 52d8495 · 52d8495
2 parents ef0067e + e8611bc
commit 52d8495
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -372,3 +372,5 @@ dist/
 /easydata.net/src/**/EasyData*.xml
 /playground/EasyDataTest
 /playground/EasyDataTest02
+/playground/EasyDataAspNetCoreTest04
+/EasyData.Dev2.sln
diff --git a/easydata.js/packs/core/src/i18n/i18n.ts b/easydata.js/packs/core/src/i18n/i18n.ts
@@ -430,7 +430,7 @@ export namespace i18n {
             }
             else if (['D', 'F', 'C'].indexOf(type) >= 0) {
                 const locale = getCurrentLocale();
-                return number.toLocaleString(locale, getNumberFromatOptions(format));
+                return number.toLocaleString(locale, getNumberFormatOptions(format));
             }
             else {
                 return convertWithMask(Math.trunc(number), format);
@@ -519,7 +519,7 @@ export namespace i18n {
         return result.split('').reverse().join('');
     }
 
-    function getNumberFromatOptions(format: string): Intl.NumberFormatOptions {
+    function getNumberFormatOptions(format: string): Intl.NumberFormatOptions {
         const localeSettings = getLocaleSettings();
         const type = format[0].toUpperCase();
         const digits = (format.length > 1) 
@@ -542,7 +542,8 @@ export namespace i18n {
             default: 
                 return {
                     style: 'decimal',
-                    minimumFractionDigits: digits
+                    minimumFractionDigits: digits,
+                    maximumFractionDigits: digits
                 }
         }
     }

diff --git a/easydata.js/packs/ui/src/grid/easy_grid.ts b/easydata.js/packs/ui/src/grid/easy_grid.ts
@@ -187,6 +187,7 @@ export class EasyGrid {
                 widthOptions[dataType] = { ...widthOptions.otherColumns, ...widthOptions[dataType] };
             }
         });
+        widthOptions[DataType.Unknown] = widthOptions.otherColumns;
     }
 
     private setSlot(slot: HTMLElement | string) {

diff --git a/easydata.js/version.json b/easydata.js/version.json
@@ -1,6 +1,6 @@
 {
-    "version": "1.4.5",
-    "baseVersion": "1.4.5",
-    "assetVersion": "01_04_05",
+    "version": "1.4.6",
+    "baseVersion": "1.4.6",
+    "assetVersion": "01_04_06",
     "tag": "latest" 
 }
diff --git a/...net/src/EasyData.EntityFrameworkCore.Relational/MetaDataLoader/DbContextMetaDataLoader.cs b/...net/src/EasyData.EntityFrameworkCore.Relational/MetaDataLoader/DbContextMetaDataLoader.cs
@@ -400,18 +400,21 @@ private bool ApplyMetaEntityAttrAnnotation(MetaEntityAttr entityAttr, PropertyIn
         /// <returns>MetaEntityAttr.</returns>
         protected virtual MetaEntityAttr CreateEntityAttribute(MetaEntity entity, IEntityType entityType, IProperty property)
         {
+            var columnType = DataUtils.GetDataTypeBySystemType(property.ClrType);
+
+            if (columnType == DataType.Unknown) return null;
+
             var propertyName = property.Name;
             var columnName = property.GetDbColumnName();
 
-            var entityAttr = Model.CreateEntityAttr(new MetaEntityAttrDescriptor()
-            {
+            var entityAttr = Model.CreateEntityAttr(new MetaEntityAttrDescriptor() {
                 Parent = entity
             });
 
             entityAttr.Id = DataUtils.ComposeKey(entity.Id, propertyName);
             entityAttr.Expr = columnName;
             entityAttr.Caption = propertyName;
-            entityAttr.DataType = DataUtils.GetDataTypeBySystemType(property.ClrType);
+            entityAttr.DataType = columnType;
 
             entityAttr.PropInfo = property.PropertyInfo;
             entityAttr.PropName = property.Name;

diff --git a/easydata.net/version.json b/easydata.net/version.json
@@ -1,5 +1,5 @@
 {
-    "assemblyVersion": "1.4.5.3",
-    "packageVersion": "1.4.5",
-    "assetVersion": "01_04_05"
+    "assemblyVersion": "1.4.6.1",
+    "packageVersion": "1.4.6",
+    "assetVersion": "01_04_06"
 }