@trudb/tru-common-lib 0.0.819 → 0.0.822

package/fesm2022/trudb-tru-common-lib.mjs

@@ -117,6 +117,23 @@ class TruEditPkeyControlConfigBase {
     constructor() { }
 }
 
+class TruMergeDataSet {
+    _data = {};
+    get = (propertyName) => {
+        return this._data[propertyName];
+    };
+    set = (propertyName, data) => {
+        this._data[propertyName] = data;
+    };
+    clear = (propertyName) => {
+        delete this._data[propertyName];
+    };
+    clearAll = () => {
+        this._data = {};
+    };
+    constructor() { }
+}
+
 class TruEntityBase {
     constructor(...args) { }
     entityAspect = new EntityAspect();
@@ -126,7 +143,7 @@ class TruEntityBase {
     Updated = undefined;
     UpdatedRef = undefined;
     rowver;
-    Merge_Data = undefined;
+    Merge_Data_Set = new TruMergeDataSet();
     Is_Invalid = undefined;
 }
 
@@ -2698,6 +2715,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.2", ngImpor
             type: Injectable
         }], ctorParameters: () => [] });
 
+class TruMergeData {
+    _value;
+    _modifiedBy;
+    _hid;
+    get value() {
+        return this._value;
+    }
+    get modifiedBy() {
+        return this._modifiedBy;
+    }
+    get hid() {
+        return this._hid;
+    }
+    constructor(value, modifiedBy, hid) {
+        this._value = value;
+        this._modifiedBy = modifiedBy;
+        this._hid = hid;
+    }
+}
+
 class TruDataChangeParser {
     dataContext;
     entity;
@@ -2772,23 +2809,11 @@ class TruDataChangeParser {
                     delete originalValues[key];
                 }
                 else {
-                    var mergeData = JSON.parse(entity.Merge_Data);
-                    if (mergeData) {
-                        mergeData[key] = {
-                            "value": this.checkIfDateTime(change.properties[key], entity[key], entityType.typeName),
-                            "modifiedBy": change.modifiedBy,
-                            "hid": change.properties[key + 'HID']
-                        };
-                    }
-                    else {
-                        mergeData = {};
-                        mergeData[key] = {
-                            "value": this.checkIfDateTime(change.properties[key], entity[key], entityType.typeName),
-                            "modifiedBy": change.modifiedBy,
-                            "hid": change.properties[key + 'HID']
-                        };
-                    }
-                    entity.Merge_Data = JSON.stringify(mergeData);
+                    let value = this.checkIfDateTime(change.properties[key], entity[key], entityType.typeName);
+                    let modifiedBy = change.modifiedBy;
+                    let hid = change.properties[key + 'HID'];
+                    let mergeData = new TruMergeData(value, modifiedBy, hid);
+                    entity.Merge_Data_Set.set(key, mergeData);
                     entity.entityAspect.validateProperty(key);
                 }
                 if (typeof (originalValues[key]) !== 'undefined')
@@ -6132,14 +6157,14 @@ class TruGridValidationDialog {
         let entity = this.config.entity;
         let originalValues = entity.entityAspect.originalValues;
         for (const key in this.config.mergeData) {
-            entity[key] = this.config.mergeData.getData(key).value;
+            entity[key] = this.config.mergeData.get(key).value;
             if (originalValues.hasOwnProperty(key))
                 delete originalValues[key];
         }
         ;
         if (Object.keys(originalValues).length === 0 && originalValues.constructor === Object)
             entity.entityAspect.setUnchanged();
-        entity.Merge_Data_Set = JSON.stringify({});
+        entity.Merge_Data_Set.clearAll();
         for (const key in this.config.mergeData) {
             entity.entityAspect.validateProperty(key);
         }
@@ -6581,7 +6606,7 @@ class TruValidationDialog {
         let entity = this.config.entity;
         let originalValues = entity.entityAspect.originalValues;
         for (const key in this.config.mergeData) {
-            entity[key] = this.config.mergeData.getData(key).value;
+            entity[key] = this.config.mergeData.get(key).value;
             if (originalValues.hasOwnProperty(key))
                 delete originalValues[key];
         }
@@ -6721,12 +6746,12 @@ class TruBreezeGridValidator {
                 }
             });
             if (targetProperty && targetProperty.Merge_Data) {
-                return targetProperty.Merge_Data;
+                return targetProperty.Merge_Data_Set;
             }
             return undefined;
         }
         else {
-            return this.entity.Merge_Data;
+            return this.entity.Merge_Data_Set?.get(this.config.propertyName);
         }
     };
     parseErrorMessages = (validationErrors) => {
@@ -6877,12 +6902,12 @@ class TruBreezeValidator {
                 }
             });
             if (targetProperty && targetProperty.Merge_Data) {
-                return targetProperty.Merge_Data;
+                return targetProperty.Merge_Data_Set;
             }
             return undefined;
         }
         else {
-            return this.entity.Merge_Data;
+            return this.entity.Merge_Data_Set?.get(this.config.propertyName);
         }
     };
     parseErrorMessages = (validationErrors) => {