@syncfusion/ej2-querybuilder 26.2.4 → 26.2.8

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.
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  * filename: index.d.ts
3
- * version : 26.2.4
3
+ * version : 26.2.8
4
4
  * Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
5
5
  * Use of this code is subject to the terms of our license.
6
6
  * A copy of the current license can be obtained at any time by e-mailing
@@ -0,0 +1 @@
1
+ hotfix/26.1.35_Vol2
package/package.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "_from": "@syncfusion/ej2-querybuilder@*",
3
- "_id": "@syncfusion/ej2-querybuilder@26.1.42",
3
+ "_id": "@syncfusion/ej2-querybuilder@26.2.5",
4
4
  "_inBundle": false,
5
- "_integrity": "sha512-eUeo0GILvx2d/nQbUuiTzfi/KGV58U6Mi8m7+2ePSOXqRqc/WLiTqE0zNTYFuEUrP+jel8GBVgfb5cl+S/qCRQ==",
5
+ "_integrity": "sha512-hLVPvcbHBj+lnh8X45JB8udX02nBTUmj6Yg0eFsIaDm7ISVuSgQr7wdX2xqBtV/57JlEFbeMqKiiZ9uoHdLo7w==",
6
6
  "_location": "/@syncfusion/ej2-querybuilder",
7
7
  "_phantomChildren": {},
8
8
  "_requested": {
@@ -23,8 +23,8 @@
23
23
  "/@syncfusion/ej2-react-querybuilder",
24
24
  "/@syncfusion/ej2-vue-querybuilder"
25
25
  ],
26
- "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-26.1.42.tgz",
27
- "_shasum": "fc12ee1a4e4112584ff5d6d99955c65a66772451",
26
+ "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-querybuilder/-/ej2-querybuilder-26.2.5.tgz",
27
+ "_shasum": "f75db9d08bd151a13279ca15bb1b795d1bac3baf",
28
28
  "_spec": "@syncfusion/ej2-querybuilder@*",
29
29
  "_where": "/jenkins/workspace/elease-automation_release_26.1.1/packages/included",
30
30
  "author": {
@@ -32,12 +32,12 @@
32
32
  },
33
33
  "bundleDependencies": false,
34
34
  "dependencies": {
35
- "@syncfusion/ej2-base": "~26.2.4",
36
- "@syncfusion/ej2-buttons": "~26.2.4",
37
- "@syncfusion/ej2-calendars": "~26.2.4",
38
- "@syncfusion/ej2-dropdowns": "~26.2.4",
39
- "@syncfusion/ej2-inputs": "~26.2.4",
40
- "@syncfusion/ej2-splitbuttons": "~26.2.4"
35
+ "@syncfusion/ej2-base": "~26.2.5",
36
+ "@syncfusion/ej2-buttons": "~26.2.8",
37
+ "@syncfusion/ej2-calendars": "~26.2.8",
38
+ "@syncfusion/ej2-dropdowns": "~26.2.8",
39
+ "@syncfusion/ej2-inputs": "~26.2.5",
40
+ "@syncfusion/ej2-splitbuttons": "~26.2.5"
41
41
  },
42
42
  "deprecated": false,
43
43
  "description": "Essential JS 2 QueryBuilder",
@@ -66,7 +66,7 @@
66
66
  "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/querybuilder"
67
67
  },
68
68
  "typings": "index.d.ts",
69
- "version": "26.2.4",
69
+ "version": "26.2.8",
70
70
  "sideEffects": false,
71
71
  "homepage": "https://www.syncfusion.com/javascript-ui-controls"
72
72
  }
@@ -1,4 +1,4 @@
1
- import { Component, INotifyPropertyChanged, NotifyPropertyChanges, getComponent, MouseEventArgs, Browser, compile, append, ModuleDeclaration, Draggable, remove } from '@syncfusion/ej2-base';import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';import { Internationalization, DateFormatOptions, KeyboardEventArgs, getUniqueID, select } from '@syncfusion/ej2-base';import { Button, CheckBox, RadioButton, ChangeEventArgs as ButtonChangeEventArgs, RadioButtonModel } from '@syncfusion/ej2-buttons';import { DropDownList, ChangeEventArgs as DropDownChangeEventArgs, FieldSettingsModel, CheckBoxSelection, DropDownTreeModel, DropDownTree, DdtFilteringEventArgs } from '@syncfusion/ej2-dropdowns';import { MultiSelect, MultiSelectChangeEventArgs, PopupEventArgs, MultiSelectModel, DropDownListModel } from '@syncfusion/ej2-dropdowns';import { EmitType, Event, EventHandler, getValue, Animation, BaseEventArgs } from '@syncfusion/ej2-base';import { Query, Predicate, DataManager, Deferred } from '@syncfusion/ej2-data';import { TextBox, NumericTextBox, InputEventArgs, ChangeEventArgs as InputChangeEventArgs } from '@syncfusion/ej2-inputs';import { TextBoxModel, NumericTextBoxModel } from '@syncfusion/ej2-inputs';import { DatePicker, ChangeEventArgs as CalendarChangeEventArgs, DatePickerModel } from '@syncfusion/ej2-calendars';import { DropDownButton, ItemModel, MenuEventArgs } from '@syncfusion/ej2-splitbuttons';import { Tooltip, createSpinner, showSpinner, hideSpinner, TooltipEventArgs } from '@syncfusion/ej2-popups';import { compile as templateCompiler } from '@syncfusion/ej2-base';
1
+ import { Component, INotifyPropertyChanged, NotifyPropertyChanges, getComponent, MouseEventArgs, Browser, compile, append, ModuleDeclaration, Draggable, remove } from '@syncfusion/ej2-base';import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';import { Internationalization, DateFormatOptions, KeyboardEventArgs, getUniqueID, select } from '@syncfusion/ej2-base';import { Button, CheckBox, RadioButton, ChangeEventArgs as ButtonChangeEventArgs, RadioButtonModel } from '@syncfusion/ej2-buttons';import { DropDownList, ChangeEventArgs as DropDownChangeEventArgs, FieldSettingsModel, CheckBoxSelection, DropDownTreeModel, DropDownTree, DdtFilteringEventArgs } from '@syncfusion/ej2-dropdowns';import { MultiSelect, MultiSelectChangeEventArgs, PopupEventArgs, MultiSelectModel, DropDownListModel } from '@syncfusion/ej2-dropdowns';import { EmitType, Event, EventHandler, getValue, Animation, BaseEventArgs } from '@syncfusion/ej2-base';import { Query, Predicate, DataManager, Deferred } from '@syncfusion/ej2-data';import { TextBox, NumericTextBox, InputEventArgs, ChangeEventArgs as InputChangeEventArgs } from '@syncfusion/ej2-inputs';import { TextBoxModel, NumericTextBoxModel } from '@syncfusion/ej2-inputs';import { DatePicker, ChangeEventArgs as CalendarChangeEventArgs, DatePickerModel } from '@syncfusion/ej2-calendars';import { DropDownButton, ItemModel, MenuEventArgs } from '@syncfusion/ej2-splitbuttons';import { Tooltip, createSpinner, showSpinner, hideSpinner, TooltipEventArgs } from '@syncfusion/ej2-popups';import { compile as templateCompiler, getNumericObject } from '@syncfusion/ej2-base';
2
2
  import {TemplateColumn,Validation,FormatObject,ActionEventArgs,ChangeEventArgs,RuleChangeEventArgs,DragEventArgs,DropEventArgs,FieldMode,DisplayMode,SortDirection} from "./query-builder";
3
3
  import {ComponentModel} from '@syncfusion/ej2-base';
4
4
 
@@ -346,6 +346,7 @@ export declare class QueryBuilder extends Component<HTMLDivElement> implements I
346
346
  private dragElement;
347
347
  private prvtEvtTgrDaD;
348
348
  private isDragEventPrevent;
349
+ private isValueEmpty;
349
350
  private ddTree;
350
351
  /**
351
352
  * Triggers when the component is created.
@@ -31,6 +31,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
31
31
  /**
32
32
  * Query Builder Source
33
33
  */
34
+ /* eslint-disable max-len */
34
35
  import { Component, NotifyPropertyChanges, getComponent, Browser, compile, append, Draggable, remove } from '@syncfusion/ej2-base';
35
36
  import { Property, ChildProperty, Complex, L10n, closest, extend, isNullOrUndefined, Collection, cldrData } from '@syncfusion/ej2-base';
36
37
  import { getInstance, addClass, removeClass, rippleEffect, detach, classList } from '@syncfusion/ej2-base';
@@ -44,7 +45,7 @@ import { TextBox, NumericTextBox } from '@syncfusion/ej2-inputs';
44
45
  import { DatePicker } from '@syncfusion/ej2-calendars';
45
46
  import { DropDownButton } from '@syncfusion/ej2-splitbuttons';
46
47
  import { Tooltip, createSpinner, showSpinner, hideSpinner } from '@syncfusion/ej2-popups';
47
- import { compile as templateCompiler } from '@syncfusion/ej2-base';
48
+ import { compile as templateCompiler, getNumericObject } from '@syncfusion/ej2-base';
48
49
  /**
49
50
  * Defines the Columns of Query Builder
50
51
  */
@@ -216,6 +217,7 @@ var QueryBuilder = /** @class */ (function (_super) {
216
217
  _this.cloneGrpBtnClick = false;
217
218
  _this.isMiddleGroup = false;
218
219
  _this.cloneRuleBtnClick = false;
220
+ _this.isValueEmpty = false;
219
221
  _this.dragStopHandler = function (e) {
220
222
  if (_this.isDragEventPrevent) {
221
223
  return;
@@ -2301,6 +2303,11 @@ var QueryBuilder = /** @class */ (function (_super) {
2301
2303
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
2302
2304
  var elem = args.currentTarget;
2303
2305
  var numericTextBoxObj = getInstance(elem, NumericTextBox);
2306
+ var decimalSeparator = getValue('decimal', getNumericObject(this.locale));
2307
+ if (isNaN(value) && elem.value.indexOf(decimalSeparator) !== -1) {
2308
+ var numberValue = parseFloat(args.currentTarget.value);
2309
+ value = numberValue;
2310
+ }
2304
2311
  numericTextBoxObj.value = value;
2305
2312
  this.isNumInput = true;
2306
2313
  }
@@ -2679,7 +2686,15 @@ var QueryBuilder = /** @class */ (function (_super) {
2679
2686
  operatorList = this.customOperators[this.selectedColumn.type + 'Operator'];
2680
2687
  }
2681
2688
  var height = (this.element.className.indexOf('e-device') > -1) ? '250px' : '200px';
2682
- var value = operatorList[0].value;
2689
+ var operator_2;
2690
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
2691
+ operatorList.forEach(function (obj) {
2692
+ if ('value' in obj && typeof obj.value === 'string' && obj.value.toLowerCase() === rule.operator.toLowerCase()) {
2693
+ operator_2 = obj.value;
2694
+ }
2695
+ });
2696
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
2697
+ var value = operator_2 ? operator_2 : operatorList[0].value;
2683
2698
  var ddlIdx = 0;
2684
2699
  if (!this.autoSelectOperator) {
2685
2700
  value = '';
@@ -5110,6 +5125,7 @@ var QueryBuilder = /** @class */ (function (_super) {
5110
5125
  * @returns {RuleModel} - Valid rule or rules collection
5111
5126
  */
5112
5127
  QueryBuilder.prototype.getValidRules = function (currentRule) {
5128
+ this.isValueEmpty = true;
5113
5129
  if (!currentRule) {
5114
5130
  currentRule = this.getRules();
5115
5131
  }
@@ -5119,6 +5135,7 @@ var QueryBuilder = /** @class */ (function (_super) {
5119
5135
  var rule = !isNullOrUndefined(currentRule.isLocked) ?
5120
5136
  this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition, isLocked: currentRule.isLocked }, true) :
5121
5137
  this.getRuleCollection({ condition: ruleCondtion, rules: ruleColl, not: notCondition }, true);
5138
+ this.isValueEmpty = false;
5122
5139
  return rule;
5123
5140
  };
5124
5141
  QueryBuilder.prototype.getRuleCollection = function (rule, isValidRule) {
@@ -5148,8 +5165,9 @@ var QueryBuilder = /** @class */ (function (_super) {
5148
5165
  rule.value = null;
5149
5166
  }
5150
5167
  }
5151
- if ((this.isRefreshed && this.enablePersistence) || (rule.field !== '' && rule.operator !== '' && (rule.value !== '' &&
5152
- rule.value !== undefined)) || (customObj && customObj.isQuestion)) {
5168
+ if ((this.isRefreshed && this.enablePersistence) || (rule.field !== '' && rule.operator !== '' &&
5169
+ (this.isValueEmpty ? rule.value !== '' && rule.value !== undefined : rule.value !== undefined)) ||
5170
+ (customObj && customObj.isQuestion)) {
5153
5171
  var condition = rule.condition;
5154
5172
  var lockedRule = rule.isLocked;
5155
5173
  rule = { 'label': rule.label, 'field': rule.field, 'operator': rule.operator, 'type': rule.type, 'value': rule.value };
@@ -47,7 +47,7 @@
47
47
  --color-sf-flyout-bg-color-pressed: #e0e0e0;
48
48
  --color-sf-flyout-bg-color-selected: #ebebeb;
49
49
  --color-sf-flyout-bg-color-focus: #f5f5f5;
50
- --color-sf-overlay-bg-color: #000;
50
+ --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
51
51
  --color-sf-table-bg-color-hover: #f5f5f5;
52
52
  --color-sf-table-bg-color-pressed: #e0e0e0;
53
53
  --color-sf-table-bg-color-selected: #ebf3fc;
@@ -369,7 +369,7 @@
369
369
  --color-sf-flyout-bg-color-pressed: var(--color-sf-black);
370
370
  --color-sf-flyout-bg-color-selected: #383838;
371
371
  --color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
372
- --color-sf-overlay-bg-color: rgba($black, .4);
372
+ --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
373
373
  --color-sf-table-bg-color-hover: #383838;
374
374
  --color-sf-table-bg-color-pressed: #2e2e2e;
375
375
  --color-sf-table-bg-color-selected: #082338;
@@ -711,9 +711,9 @@
711
711
  --color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
712
712
  --color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
713
713
  --color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
714
- --color-sf-overlay-bg-color: rgba($black, .4);
715
- --color-sf-table-bg-color-hover: var(--color-sf-black);
716
- --color-sf-table-bg-color-pressed: var(--color-sf-black);
714
+ --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
715
+ --color-sf-table-bg-color-hover: #1a3bff;
716
+ --color-sf-table-bg-color-pressed: #1a3bff;
717
717
  --color-sf-table-bg-color-selected: #1a3bff;
718
718
  --color-sf-content-text-color: #fff;
719
719
  --color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
@@ -732,12 +732,12 @@
732
732
  --color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
733
733
  --color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
734
734
  --color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
735
- --color-sf-table-text-color-hover: var(--color-sf-content-text-color-hover);
736
- --color-sf-table-text-color-pressed: var(--color-sf-content-text-color-hover);
737
- --color-sf-table-text-color-selected: var(--color-sf-content-text-color-hover);
735
+ --color-sf-table-text-color-hover: #000;
736
+ --color-sf-table-text-color-pressed: #000;
737
+ --color-sf-table-text-color-selected: #000;
738
738
  --color-sf-icon-color: #fff;
739
- --color-sf-icon-color-hover: var(--color-sf-content-text-color-hover);
740
- --color-sf-icon-color-pressed: var(--color-sf-content-text-color-hover);
739
+ --color-sf-icon-color-hover: #000;
740
+ --color-sf-icon-color-pressed: #000;
741
741
  --color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
742
742
  --color-sf-border-light: #fff;
743
743
  --color-sf-border: var(--color-sf-border-light);
@@ -2039,7 +2039,7 @@
2039
2039
  }
2040
2040
 
2041
2041
  .e-query-builder .e-btn.e-round.e-small:hover {
2042
- background: transparent !important; /* stylelint-disable-line declaration-no-important */
2042
+ background: var(--color-sf-content-bg-color-hover) !important; /* stylelint-disable-line declaration-no-important */
2043
2043
  }
2044
2044
  .e-query-builder .e-btn.e-round.e-small:focus {
2045
2045
  background: var(--color-sf-content-bg-color-hover) !important; /* stylelint-disable-line declaration-no-important */
@@ -199,7 +199,7 @@
199
199
  .e-query-builder .e-btn.e-round.e-small {
200
200
  @if $theme-name == 'fluent2' {
201
201
  &:hover {
202
- background: transparent !important; /* stylelint-disable-line declaration-no-important */
202
+ background: $content-bg-color-hover !important; /* stylelint-disable-line declaration-no-important */
203
203
  }
204
204
 
205
205
  &:focus {
@@ -47,7 +47,7 @@
47
47
  --color-sf-flyout-bg-color-pressed: #e0e0e0;
48
48
  --color-sf-flyout-bg-color-selected: #ebebeb;
49
49
  --color-sf-flyout-bg-color-focus: #f5f5f5;
50
- --color-sf-overlay-bg-color: #000;
50
+ --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
51
51
  --color-sf-table-bg-color-hover: #f5f5f5;
52
52
  --color-sf-table-bg-color-pressed: #e0e0e0;
53
53
  --color-sf-table-bg-color-selected: #ebf3fc;
@@ -369,7 +369,7 @@
369
369
  --color-sf-flyout-bg-color-pressed: var(--color-sf-black);
370
370
  --color-sf-flyout-bg-color-selected: #383838;
371
371
  --color-sf-flyout-bg-color-focus: var(--color-sf-flyout-bg-color-hover);
372
- --color-sf-overlay-bg-color: rgba($black, .4);
372
+ --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
373
373
  --color-sf-table-bg-color-hover: #383838;
374
374
  --color-sf-table-bg-color-pressed: #2e2e2e;
375
375
  --color-sf-table-bg-color-selected: #082338;
@@ -711,9 +711,9 @@
711
711
  --color-sf-flyout-bg-color-pressed: var(--color-sf-content-bg-color-hover);
712
712
  --color-sf-flyout-bg-color-selected: var(--color-sf-content-bg-color-hover);
713
713
  --color-sf-flyout-bg-color-focus: var(--color-sf-content-bg-color-hover);
714
- --color-sf-overlay-bg-color: rgba($black, .4);
715
- --color-sf-table-bg-color-hover: var(--color-sf-black);
716
- --color-sf-table-bg-color-pressed: var(--color-sf-black);
714
+ --color-sf-overlay-bg-color: rgba(0, 0, 0, .4);
715
+ --color-sf-table-bg-color-hover: #1a3bff;
716
+ --color-sf-table-bg-color-pressed: #1a3bff;
717
717
  --color-sf-table-bg-color-selected: #1a3bff;
718
718
  --color-sf-content-text-color: #fff;
719
719
  --color-sf-content-text-color-alt1: var(--color-sf-content-text-color);
@@ -732,12 +732,12 @@
732
732
  --color-sf-flyout-text-color-selected: var(--color-sf-content-text-color-hover);
733
733
  --color-sf-flyout-text-color-focus: var(--color-sf-content-text-color-hover);
734
734
  --color-sf-flyout-text-color-disabled: var(--color-sf-content-text-color-disabled);
735
- --color-sf-table-text-color-hover: var(--color-sf-content-text-color-hover);
736
- --color-sf-table-text-color-pressed: var(--color-sf-content-text-color-hover);
737
- --color-sf-table-text-color-selected: var(--color-sf-content-text-color-hover);
735
+ --color-sf-table-text-color-hover: #000;
736
+ --color-sf-table-text-color-pressed: #000;
737
+ --color-sf-table-text-color-selected: #000;
738
738
  --color-sf-icon-color: #fff;
739
- --color-sf-icon-color-hover: var(--color-sf-content-text-color-hover);
740
- --color-sf-icon-color-pressed: var(--color-sf-content-text-color-hover);
739
+ --color-sf-icon-color-hover: #000;
740
+ --color-sf-icon-color-pressed: #000;
741
741
  --color-sf-icon-color-disabled: var(--color-sf-content-text-color-disabled);
742
742
  --color-sf-border-light: #fff;
743
743
  --color-sf-border: var(--color-sf-border-light);
@@ -2039,7 +2039,7 @@
2039
2039
  }
2040
2040
 
2041
2041
  .e-query-builder .e-btn.e-round.e-small:hover {
2042
- background: transparent !important; /* stylelint-disable-line declaration-no-important */
2042
+ background: var(--color-sf-content-bg-color-hover) !important; /* stylelint-disable-line declaration-no-important */
2043
2043
  }
2044
2044
  .e-query-builder .e-btn.e-round.e-small:focus {
2045
2045
  background: var(--color-sf-content-bg-color-hover) !important; /* stylelint-disable-line declaration-no-important */