@recursyve/nice-data-filter-kit 14.3.1 → 14.3.2
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.
- package/esm2020/lib/components/nice-filter-view/components/advanced-filters/advanced-filters.form.mjs +4 -10
- package/fesm2015/recursyve-nice-data-filter-kit.mjs +3 -9
- package/fesm2015/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/fesm2020/recursyve-nice-data-filter-kit.mjs +3 -9
- package/fesm2020/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/lib/components/nice-filter-view/components/advanced-filters/advanced-filters.form.d.ts +0 -1
- package/package.json +1 -1
|
@@ -3394,7 +3394,7 @@ __decorate([
|
|
|
3394
3394
|
], FilterFormValues.prototype, "value", void 0);
|
|
3395
3395
|
__decorate([
|
|
3396
3396
|
Control(),
|
|
3397
|
-
AddValidatorIf(({ parent }) => parent.
|
|
3397
|
+
AddValidatorIf(({ parent }) => QBFilterUtils.isDoubleInput(parent.operation), Validators.required),
|
|
3398
3398
|
__metadata("design:type", Object)
|
|
3399
3399
|
], FilterFormValues.prototype, "secondValue", void 0);
|
|
3400
3400
|
class FilterForm {
|
|
@@ -3409,7 +3409,6 @@ class FilterForm {
|
|
|
3409
3409
|
id: rule.id,
|
|
3410
3410
|
operation: rule.operation,
|
|
3411
3411
|
condition: "or",
|
|
3412
|
-
needsTwoValues,
|
|
3413
3412
|
values: [
|
|
3414
3413
|
{
|
|
3415
3414
|
value: needsTwoValues ? rule.value[0] : rule.value,
|
|
@@ -3429,7 +3428,6 @@ class FilterForm {
|
|
|
3429
3428
|
id: firstRule.id,
|
|
3430
3429
|
operation: firstRule.operation,
|
|
3431
3430
|
condition: query.condition,
|
|
3432
|
-
needsTwoValues: firstRuleNeedsTwoValues,
|
|
3433
3431
|
values: query.rules.map((rule) => ({
|
|
3434
3432
|
value: firstRuleNeedsTwoValues ? rule.value[0] : rule.value,
|
|
3435
3433
|
secondValue: firstRuleNeedsTwoValues ? rule.value[1] : undefined
|
|
@@ -3443,7 +3441,7 @@ class FilterForm {
|
|
|
3443
3441
|
return {
|
|
3444
3442
|
id: this.id,
|
|
3445
3443
|
operation: this.operation,
|
|
3446
|
-
value: this.
|
|
3444
|
+
value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
|
|
3447
3445
|
};
|
|
3448
3446
|
}
|
|
3449
3447
|
return {
|
|
@@ -3451,7 +3449,7 @@ class FilterForm {
|
|
|
3451
3449
|
rules: this.values.map((value) => ({
|
|
3452
3450
|
id: this.id,
|
|
3453
3451
|
operation: this.operation,
|
|
3454
|
-
value: this.
|
|
3452
|
+
value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
|
|
3455
3453
|
}))
|
|
3456
3454
|
};
|
|
3457
3455
|
}
|
|
@@ -3466,10 +3464,6 @@ __decorate([
|
|
|
3466
3464
|
Required(),
|
|
3467
3465
|
__metadata("design:type", String)
|
|
3468
3466
|
], FilterForm.prototype, "operation", void 0);
|
|
3469
|
-
__decorate([
|
|
3470
|
-
Control(),
|
|
3471
|
-
__metadata("design:type", Boolean)
|
|
3472
|
-
], FilterForm.prototype, "needsTwoValues", void 0);
|
|
3473
3467
|
__decorate([
|
|
3474
3468
|
Control(),
|
|
3475
3469
|
Required(),
|