ms-data-grid 0.0.133 → 0.0.134
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4368,10 +4368,18 @@ class DataGridComponent {
|
|
|
4368
4368
|
this.selectedFilterOptions = this.selectedColumnForFilter?.column_dropdown_value?.filter((option) => this.currentFilterSelectedIds.has(option?.id || option?._id || option));
|
|
4369
4369
|
}
|
|
4370
4370
|
else if (['string', 'number', 'date', 'time'].includes(col.type)) {
|
|
4371
|
-
this.firstCondition =
|
|
4371
|
+
this.firstCondition =
|
|
4372
|
+
col?.query?.first_condition ??
|
|
4373
|
+
((col.type === 'number' || col.type === 'time' || col.type === 'date')
|
|
4374
|
+
? 'equal'
|
|
4375
|
+
: 'contain');
|
|
4372
4376
|
this.firstValue = col?.query?.first_value || '';
|
|
4373
4377
|
this.condition = col?.query?.condition || 'none';
|
|
4374
|
-
this.secondCondition =
|
|
4378
|
+
this.secondCondition =
|
|
4379
|
+
col?.query?.second_condition ??
|
|
4380
|
+
((col.type === 'number' || col.type === 'time' || col.type === 'date')
|
|
4381
|
+
? 'equal'
|
|
4382
|
+
: 'contain');
|
|
4375
4383
|
this.secondValue = col?.query?.second_value || '';
|
|
4376
4384
|
}
|
|
4377
4385
|
this.cdr.detectChanges();
|