@colijnit/corecomponents_v12 12.2.8 → 12.2.10
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/bundles/colijnit-corecomponents_v12.umd.js +25 -5
- package/bundles/colijnit-corecomponents_v12.umd.js.map +1 -1
- package/colijnit-corecomponents_v12.metadata.json +1 -1
- package/esm2015/lib/components/base/base-input.component.js +3 -3
- package/esm2015/lib/components/filter-item/filter-item.component.js +40 -1
- package/esm2015/lib/components/input-number-picker/input-number-picker.component.js +3 -3
- package/esm2015/lib/core/enum/filterItem-mode.enum.js +4 -1
- package/fesm2015/colijnit-corecomponents_v12.js +46 -4
- package/fesm2015/colijnit-corecomponents_v12.js.map +1 -1
- package/lib/components/double-calendar/style/_layout.scss +1 -1
- package/lib/components/filter-item/filter-item.component.d.ts +2 -0
- package/lib/core/enum/filterItem-mode.enum.d.ts +1 -0
- package/lib/style/_input.mixins.scss +1 -0
- package/package.json +1 -1
|
@@ -2231,7 +2231,7 @@ class BaseInputComponent {
|
|
|
2231
2231
|
}
|
|
2232
2232
|
doBlur(event, handleCommit = true) {
|
|
2233
2233
|
return __awaiter(this, void 0, void 0, function* () {
|
|
2234
|
-
if (this.showSaveCancel && handleCommit) {
|
|
2234
|
+
if (this.showSaveCancel && handleCommit && this._modelDirtyForCommit) {
|
|
2235
2235
|
yield this._handleCommit(event, false);
|
|
2236
2236
|
}
|
|
2237
2237
|
setTimeout(() => {
|
|
@@ -2371,10 +2371,10 @@ class BaseInputComponent {
|
|
|
2371
2371
|
this._commitButtonsComponentRef.instance.commitFinished = false;
|
|
2372
2372
|
this._commitButtonsComponentRef.instance.committing = true;
|
|
2373
2373
|
}
|
|
2374
|
+
this._modelDirtyForCommit = false;
|
|
2374
2375
|
const success = yield this.commit(this.model);
|
|
2375
2376
|
this.keepFocus = false;
|
|
2376
2377
|
yield this._commitFinished();
|
|
2377
|
-
this._modelDirtyForCommit = false;
|
|
2378
2378
|
if (success && doBlur) {
|
|
2379
2379
|
this.doBlur(event, false);
|
|
2380
2380
|
}
|
|
@@ -5185,6 +5185,9 @@ var FilterItemMode;
|
|
|
5185
5185
|
//This mode makes the Filter display a min and max field. This should eventually be a slider.
|
|
5186
5186
|
// input is passed along as "min - max"
|
|
5187
5187
|
FilterItemMode["Slider"] = "slider";
|
|
5188
|
+
//This mode makes the Filter display a min and max field. This should eventually be a slider.
|
|
5189
|
+
// input is passed along as "min - max" This version can be emptied.
|
|
5190
|
+
FilterItemMode["NullableSlider"] = "nullableSlider";
|
|
5188
5191
|
//This mode makes the Filter display a simple textfield.
|
|
5189
5192
|
// The value typed into the field will be passed along directly as a string.
|
|
5190
5193
|
FilterItemMode["TextField"] = "textField";
|
|
@@ -7177,7 +7180,7 @@ class InputNumberPickerComponent extends BaseInputComponent {
|
|
|
7177
7180
|
}
|
|
7178
7181
|
// @override
|
|
7179
7182
|
set model(model) {
|
|
7180
|
-
|
|
7183
|
+
this.setValue(model, true);
|
|
7181
7184
|
super.model = model;
|
|
7182
7185
|
}
|
|
7183
7186
|
get model() {
|
|
@@ -7205,7 +7208,7 @@ class InputNumberPickerComponent extends BaseInputComponent {
|
|
|
7205
7208
|
return true;
|
|
7206
7209
|
}
|
|
7207
7210
|
ngOnInit() {
|
|
7208
|
-
this.numberLogic.setValue(this.model, true);
|
|
7211
|
+
// this.numberLogic.setValue(this.model, true);
|
|
7209
7212
|
// this.numberLogic.init(true);
|
|
7210
7213
|
this._updateButtonsShowState();
|
|
7211
7214
|
}
|
|
@@ -11156,6 +11159,7 @@ class FilterItemComponent {
|
|
|
11156
11159
|
this.noResultsLabel = "No results";
|
|
11157
11160
|
this.sliderDefaultMin = 0;
|
|
11158
11161
|
this.sliderDefaultMax = 100000;
|
|
11162
|
+
this.fullRangeIsNull = false;
|
|
11159
11163
|
this.modelChange = new EventEmitter();
|
|
11160
11164
|
this.collectionChange = new EventEmitter();
|
|
11161
11165
|
this.filterButtonClicked = new EventEmitter();
|
|
@@ -11243,6 +11247,10 @@ class FilterItemComponent {
|
|
|
11243
11247
|
this.showButton = true;
|
|
11244
11248
|
this._createModelForSliderMode();
|
|
11245
11249
|
break;
|
|
11250
|
+
case this.modes.NullableSlider:
|
|
11251
|
+
this.showButton = true;
|
|
11252
|
+
this._createModelForNullableSliderMode();
|
|
11253
|
+
break;
|
|
11246
11254
|
case this.modes.CheckboxToText:
|
|
11247
11255
|
this.showButton = true;
|
|
11248
11256
|
this._createModelForCheckboxToText();
|
|
@@ -11330,6 +11338,7 @@ class FilterItemComponent {
|
|
|
11330
11338
|
this._readModelForSelectListWithNumberOutput(newModel);
|
|
11331
11339
|
break;
|
|
11332
11340
|
case this.modes.Slider:
|
|
11341
|
+
case this.modes.NullableSlider:
|
|
11333
11342
|
this._readModelForSliderMode(newModel);
|
|
11334
11343
|
break;
|
|
11335
11344
|
case this.modes.CheckboxToText:
|
|
@@ -11417,6 +11426,16 @@ class FilterItemComponent {
|
|
|
11417
11426
|
this.sliderMax = trueUpperBound;
|
|
11418
11427
|
this._model = `${trueLowerBound} - ${trueUpperBound}`;
|
|
11419
11428
|
}
|
|
11429
|
+
_createModelForNullableSliderMode() {
|
|
11430
|
+
if (this.sliderMin && this.sliderMax) {
|
|
11431
|
+
let trueLowerBound = Math.min(this.sliderMin, this.sliderMax);
|
|
11432
|
+
let trueUpperBound = Math.max(this.sliderMin, this.sliderMax);
|
|
11433
|
+
this._model = `${trueLowerBound} - ${trueUpperBound}`;
|
|
11434
|
+
}
|
|
11435
|
+
else {
|
|
11436
|
+
this._model = null;
|
|
11437
|
+
}
|
|
11438
|
+
}
|
|
11420
11439
|
_createModelForCheckboxToText() {
|
|
11421
11440
|
if (this.checkBoxToTextModel) {
|
|
11422
11441
|
this._model = "?='J'";
|
|
@@ -11669,6 +11688,28 @@ FilterItemComponent.decorators = [
|
|
|
11669
11688
|
(focusout)="handleModelChange(sliderMax)"
|
|
11670
11689
|
></co-input-text>
|
|
11671
11690
|
</div>
|
|
11691
|
+
<div class="co-filter-item-slider-content" *ngIf="mode === modes.NullableSlider">
|
|
11692
|
+
<co-input-text
|
|
11693
|
+
class="slider-from"
|
|
11694
|
+
[type]="'number'"
|
|
11695
|
+
[digitsOnly]="true"
|
|
11696
|
+
[hideArrowButtons]="true"
|
|
11697
|
+
[excludePlusMinus]="true"
|
|
11698
|
+
[label]="'FROM' | localize"
|
|
11699
|
+
[(model)]="sliderMin"
|
|
11700
|
+
(focusout)="handleModelChange(sliderMin)"
|
|
11701
|
+
></co-input-text>
|
|
11702
|
+
<co-input-text
|
|
11703
|
+
class="slider-to"
|
|
11704
|
+
[type]="'number'"
|
|
11705
|
+
[digitsOnly]="true"
|
|
11706
|
+
[hideArrowButtons]="true"
|
|
11707
|
+
[excludePlusMinus]="true"
|
|
11708
|
+
[label]="'TO' | localize"
|
|
11709
|
+
[(model)]="sliderMax"
|
|
11710
|
+
(focusout)="handleModelChange(sliderMax)"
|
|
11711
|
+
></co-input-text>
|
|
11712
|
+
</div>
|
|
11672
11713
|
<div class="co-filter-item-checkbox-content" *ngIf="mode === modes.Checkbox ">
|
|
11673
11714
|
<co-input-checkbox
|
|
11674
11715
|
[(model)]="model"
|
|
@@ -11732,6 +11773,7 @@ FilterItemComponent.propDecorators = {
|
|
|
11732
11773
|
noResultsLabel: [{ type: Input }],
|
|
11733
11774
|
sliderDefaultMin: [{ type: Input }],
|
|
11734
11775
|
sliderDefaultMax: [{ type: Input }],
|
|
11776
|
+
fullRangeIsNull: [{ type: Input }],
|
|
11735
11777
|
model: [{ type: Input }],
|
|
11736
11778
|
modelChange: [{ type: Output }],
|
|
11737
11779
|
collectionChange: [{ type: Output }],
|