Merge pull request #188 from KorzhCom/dev

Version 1.5.4
KorzhCom · Mar 14, 2024 · 2a7a2bb · 2a7a2bb
2 parents 9c1969c + 39e11fc
commit 2a7a2bb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/easydata.js/packs/ui/src/grid/easy_grid.ts b/easydata.js/packs/ui/src/grid/easy_grid.ts
@@ -74,7 +74,7 @@ export class EasyGrid implements EasyGridBase {
         allowDragDrop: false,
         aggregates: {
             settings: null,
-            calculator: null
+            calculatorRef: null
         },
         paging: {
             enabled: true,
@@ -710,7 +710,7 @@ export class EasyGrid implements EasyGridBase {
             rowElement.appendChild(this.renderCell(column, index, val, rowElement));
         });
 
-        const aggrContainer = this.options.aggregates.calculator.getAggrContainer();
+        const aggrContainer = this.options.aggregates.calculatorRef.getAggrContainer();
         const aggrCols = aggrSettings.getAggregates().map(c => c.colId);
 
         const key = aggrSettings.buildGroupKey(group, row);

diff --git a/easydata.js/packs/ui/src/grid/easy_grid_options.ts b/easydata.js/packs/ui/src/grid/easy_grid_options.ts
@@ -43,7 +43,7 @@ export interface EasyGridOptions {
     aggregates?: {
         showGrandTotalsOnEachPage?: boolean,
         settings: AggregationSettings,
-        calculator: AggregatesCalculator
+        calculatorRef: AggregatesCalculator
     },
     showPlusButton?: boolean;
     plusButtonTitle?: string;

diff --git a/easydata.js/version.json b/easydata.js/version.json
@@ -1,6 +1,6 @@
 {
-    "version": "1.5.3",
-    "baseVersion": "1.5.3",
-    "assetVersion": "01_05_03",
+    "version": "1.5.4",
+    "baseVersion": "1.5.4",
+    "assetVersion": "01_05_04",
     "tag": "latest" 
 }
diff --git a/easydata.net/src/EasyData.Core/MetaData.cs b/easydata.net/src/EasyData.Core/MetaData.cs
@@ -117,7 +117,6 @@ public MetaData()
             nullEntity.Name = "";
 
             AddDefaultDisplayFormats();
-
         }
 
         /// <summary>
@@ -523,7 +522,7 @@ private void CheckModelId()
 
 
         /// <summary>
-        /// Inits the model loading.
+        /// Initializes the model loading.
         /// </summary>
         public virtual void InitModelLoading()
         {
@@ -912,18 +911,13 @@ protected virtual async Task WriteModelPropsToJsonAsync(JsonWriter writer, BitOp
         /// <returns>Task.</returns>
         protected virtual async Task WriteContentToJsonAsync(JsonWriter writer, BitOptions rwOptions, CancellationToken ct)
         {
-
-            await writer.WritePropertyNameAsync("displayFormats", ct).ConfigureAwait(false);
-            await WriteDisplayFormatsToJsonAsync(writer, ct).ConfigureAwait(false);
-
             await WriteBasicNodesAsync(writer, rwOptions, ct).ConfigureAwait(false);
 
             await WriteEntitiesAsync(writer, rwOptions, ct).ConfigureAwait(false);
         }
 
         protected virtual async Task WriteBasicNodesAsync(JsonWriter writer, BitOptions rwOptions, CancellationToken ct)
         {
-
             await writer.WritePropertyNameAsync("displayFormats", ct).ConfigureAwait(false);
             await WriteDisplayFormatsToJsonAsync(writer, ct).ConfigureAwait(false);