mmhglobal-dynamicform 2.23.0 → 2.23.2

package/fesm2015/mmhglobal-dynamicform.mjs

@@ -2504,7 +2504,7 @@ class ZGridBindingDirective extends DataBindingDirective {
                 }
                 this.gridSetting = Object.assign(Object.assign({}, this.gridSetting), { columnField: data, group: this.zgridbinding.group, columnConfigurations: columnsConfig });
                 ZComponentHelper.getGridColumns(this.gridSetting);
-                this.loggingService.logToConsoleForDebug('generated grid columns', this.gridSetting);
+                this.loggingService.debugLog('generated grid columns', this.gridSetting);
                 this.getFilterParamsColumns();
                 this.getFilter();
                 this.getFilterParams();
@@ -3118,10 +3118,20 @@ class ZGridBindingDirective extends DataBindingDirective {
             console.log("GridFilterConfiguration.OnChange triggered");
             // Use switchMap to handle the asynchronous operation
             of(this.params.filterParams).pipe(switchMap((filterParams) => {
+                // Get the function expression from the configuration
                 let expression = this.field.GridFilterConfiguration.OnChange;
-                expression = expression.replace('modalGroup.', 'group.');
-                expression = expression.replace('group.', 'grp.');
-                const func = eval('this.' + expression);
+                // Replace 'modalGroup.' with 'group.' and 'group.' with 'grp.'
+                expression = expression.replace(/modalGroup\./g, 'group.').replace(/group\./g, 'grp.');
+                // Ensure the expression starts with 'this.' to avoid accessing global scope
+                if (!expression.startsWith('this.')) {
+                    expression = `this.${expression}`;
+                }
+                const func = eval(expression);
+                if (!func) {
+                    this.loggingService.log(`${expression} not found in this scope for ${this.field.Name} grid.`);
+                    // Since function not found, we return the original params.
+                    return of(this.params.filterParams);
+                }
                 const callFunc = func.bind(this.grp);
                 return callFunc(filterParams);
             })).subscribe((updatedFilterParams) => {
@@ -3174,14 +3184,6 @@ class ZGridBindingDirective extends DataBindingDirective {
     getPageNo(stateSkip, stateTake) {
         return stateSkip / stateTake;
     }
-    beforeGridGetData(group, me) {
-        console.warn("beforeDataBinding triggered");
-        if (!group.beforeGridGetData) {
-            console.warn("group.beforeDataBinding is undefined");
-            return of(true);
-        }
-        return group.beforeGridGetData(group, me);
-    }
     // columnField = data: Array<ZField>,
     // columns = gridColumns: any[],
     // group = group: ZGroup,
@@ -3191,7 +3193,7 @@ class ZGridBindingDirective extends DataBindingDirective {
     setColumns(columns) {
         this.gridSetting.columnField = columns;
         ZComponentHelper.getGridColumns(this.gridSetting);
-        this.loggingService.logToConsoleForDebug('generated grid columns', this.gridSetting);
+        this.loggingService.debugLog('generated grid columns', this.gridSetting);
     }
 }
 ZGridBindingDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: ZGridBindingDirective, deps: [{ token: GridComponent }, { token: i2.WebApiService }, { token: i2.ToastService }, { token: i2.OfflineDatabaseService }, { token: i2.SignalrService }, { token: ZGridService }, { token: i2.LoggingService }], target: i0.ɵɵFactoryTarget.Directive });
@@ -9584,14 +9586,6 @@ class ZgridComponent extends DataListingFieldBase {
     }
     //#endregion
     //#region Event
-    beforeGridGetData(group, me) {
-        console.warn("beforeDataBinding triggered");
-        if (!group.beforeGridGetData) {
-            console.warn("group.beforeDataBinding is undefined");
-            return of(true);
-        }
-        return group.beforeGridGetData(group, me);
-    }
     // Source: https://www.telerik.com/forums/kendo-angular-grid-blank-space-in-the-end-when-you-resize(reduce)-any-column
     adjustWidthUponResize() {
         const tableWidth = document.querySelector(".k-grid-table")[`offsetWidth`];