Skip to content

Commit ae82e11

Browse files
author
pipeline
committed
v20.1.50 is released
1 parent b734bb2 commit ae82e11

File tree

244 files changed

+2037
-1495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

244 files changed

+2037
-1495
lines changed

controls/base/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
## 20.1.50 (2022-04-19)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `I370803` - The issue with "Script error occurs while opening the popup in the DropDownList" has been resolved.
12+
513
## 20.1.48 (2022-04-12)
614

715
### Common

controls/base/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@syncfusion/ej2-base",
3-
"version": "20.1.47",
3+
"version": "20.1.48",
44
"description": "A common package of Essential JS 2 base libraries, methods and class definitions",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

controls/base/src/template.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,11 @@ export function compile(template: string, helper?: Object, ignorePrefix?: boolea
8383
var str1 = str;
8484
for (var i=0; i < check.length; i++) {
8585
var check1 = str.match(hrefRegex)[i].split('href=')[1];
86-
var change = check1.match(/^'/) !== null ? check1.replace(/^'/, '\"') : check1;
87-
change =change.match(/.$/)[0] === '\\'' ? change.replace(/.$/,'\"') : change;
88-
str1 = str1.replace(check1, change);
86+
if (check1) {
87+
var change = check1.match(/^'/) !== null ? check1.replace(/^'/, '\"') : check1;
88+
change =change.match(/.$/)[0] === '\\'' ? change.replace(/.$/,'\"') : change;
89+
str1 = str1.replace(check1, change);
90+
}
8991
}
9092
str = str.replace(str, str1);
9193
}

controls/base/themestudio/styles/grids/grid/_bootstrap-dark-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ $grid-edit-input-bigger-margin: 2px !default;
355355
$grid-device-ungroupbutton-line-height: 37px !default;
356356
$grid-device-groupheadercell-span-line-height: 33px !default;
357357
$frozen-border-color: $grey-dd !default;
358+
$grid-frozenborder-disabled-color: $grey-base !default;
358359
$grid-freezeline-right-border: rgba($grey-dd, .6) !default;
359360
$grid-freezeline-border: 2px solid !default;
360361
$grid-edit-checkbox-bigger-padding-left: 8px !default;

controls/base/themestudio/styles/grids/grid/_bootstrap-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ $grid-edit-input-bigger-margin: 2px !default;
359359
$grid-device-ungroupbutton-line-height: 37px !default;
360360
$grid-device-groupheadercell-span-line-height: 33px !default;
361361
$frozen-border-color: $brand-primary !default;
362+
$grid-frozenborder-disabled-color: $content-bg-color !default;
362363
$grid-freezeline-right-border: rgba($brand-primary, .6) !default;
363364
$grid-freezeline-border: 2px solid !default;
364365
$grid-edit-checkbox-bigger-padding-left: 8px !default;

controls/base/themestudio/styles/grids/grid/_bootstrap4-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ $grid-edit-input-bigger-margin: 2px !default;
359359
$grid-device-ungroupbutton-line-height: 37px !default;
360360
$grid-device-groupheadercell-span-line-height: 33px !default;
361361
$frozen-border-color: $gray-600 !default;
362+
$grid-frozenborder-disabled-color: $content-bg !default;
362363
$grid-freezeline-right-border: rgba($gray-600, .6) !default;
363364
$grid-freezeline-border: 2px solid !default;
364365
$grid-edit-checkbox-bigger-padding-left: 8px !default;

controls/base/themestudio/styles/grids/grid/_bootstrap5-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ $grid-edit-input-bigger-margin: 2px !default;
357357
$grid-device-ungroupbutton-line-height: 37px !default;
358358
$grid-device-groupheadercell-span-line-height: 33px !default;
359359
$frozen-border-color: $border-light !default;
360+
$grid-frozenborder-disabled-color: $content-bg-color !default;
360361
$grid-freezeline-right-border: rgba($primary-light, 1) !default;
361362
$grid-freezeline-border: 2px solid !default;
362363
$grid-edit-checkbox-bigger-padding-left: 8px !default;

controls/base/themestudio/styles/grids/grid/_fabric-dark-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ $grid-columnchooser-content-margin: 22px 0 20px !default;
351351
$grid-columnchooser-toolbardiv-padding: 2px 0 0 !default;
352352
$grid-device-ungroupbutton-line-height: 31px !default;
353353
$frozen-border-color: $neutral-primary !default;
354+
$grid-frozenborder-disabled-color: $content-bg-color !default;
354355
$grid-freezeline-right-border: rgba($neutral-primary, .6) !default;
355356
$grid-freezeline-border: 2px solid !default;
356357
$grid-edit-checkbox-bigger-padding-left: 8px !default;

controls/base/themestudio/styles/grids/grid/_fabric-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ $grid-columnchooser-content-margin: 22px 0 20px !default;
354354
$grid-columnchooser-toolbardiv-padding: 2px 0 0 !default;
355355
$grid-device-ungroupbutton-line-height: 31px !default;
356356
$frozen-border-color: $theme-primary !default;
357+
$grid-frozenborder-disabled-color: $content-bg-color !default;
357358
$grid-freezeline-right-border: rgba($theme-primary, .6) !default;
358359
$grid-freezeline-border: 2px solid !default;
359360
$grid-edit-checkbox-bigger-padding-left: 8px !default;

controls/base/themestudio/styles/grids/grid/_fluent-definition.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ $grid-val-error-color: $danger-dark !default;
5656
$grid-val-error-bg-color: $danger-light !default;
5757
$grid-columnchooser-footer-border-color: rgba($border-light, .12) !default;
5858
$frozen-border-color: $border-light !default;
59-
$grid-freezeline-right-border: rgba($border-light, .6) !default;
59+
$grid-frozenborder-disabled-color: $content-bg-color !default;
60+
$grid-freezeline-right-border: $primary-light !default;
6061
$grid-freezeline-border: 2px solid !default;
6162
$grid-filtered-color: $primary !default;
6263
$grid-autofill-color: $primary !default;

controls/base/themestudio/styles/grids/grid/_highcontrast-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ $grid-edit-checkbox-bigger-padding-left: 8px !default;
344344
$grid-edit-checkbox-bigger-padding-top: 8px !default;
345345
$grid-device-ungroupbutton-line-height: 31px !default;
346346
$frozen-border-color: $selection-border !default;
347+
$grid-frozenborder-disabled-color: $bg-base-0 !default;
347348
$grid-freezeline-right-border: rgba($border-fg-alt, .6) !default;
348349
$grid-freezeline-border: 2px solid !default;
349350
$grid-headercelldiv-fltricon-margin: 0 26px 0 0 !default;

controls/base/themestudio/styles/grids/grid/_highcontrast-light-definition.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ $grid-edit-checkbox-bigger-padding-left: 8px !default;
341341
$grid-edit-checkbox-bigger-padding-top: 8px !default;
342342
$grid-device-ungroupbutton-line-height: 31px !default;
343343
$frozen-border-color: $selection-border !default;
344+
$grid-frozenborder-disabled-color: $bg-base-0 !default;
344345
$grid-freezeline-right-border: rgba($border-fg-alt, .6) !default;
345346
$grid-freezeline-border: 2px solid !default;
346347
$grid-headercelldiv-fltricon-margin: 0 26px 0 0 !default;

controls/base/themestudio/styles/grids/grid/_layout.scss

Lines changed: 134 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -644,59 +644,69 @@
644644
}
645645
}
646646

647-
// .e-rowcell.e-frozen-right-border,
648-
// .e-headercell.e-frozen-right-border {
649-
// border-right: $grid-freezeline-border $grid-freezeline-right-border;
650-
// }
651-
652-
// .e-rowcell.e-frozen-left-border,
653-
// .e-headercell.e-frozen-left-border {
654-
// border-left: $grid-freezeline-border $grid-freezeline-right-border;
655-
// }
656-
657-
// .e-rowcell.e-freezeline {
658-
// position: relative;
659-
// }
660-
661-
// .e-rowcell .e-frozen-right-cursor,
662-
// .e-rowcell .e-frozen-left-cursor,
663-
// .e-gridheader .e-headercell .e-frozen-right-cursor,
664-
// .e-gridheader .e-headercell .e-frozen-left-cursor {
665-
// cursor: move;
666-
// height: 100%;
667-
// position: absolute;
668-
// top: 0;
669-
// width: 4px;
670-
// }
671-
672-
// .e-rowcell .e-frozen-left-cursor,
673-
// .e-gridheader .e-headercell .e-frozen-left-cursor {
674-
// right: 0;
675-
// }
676-
677-
// .e-rowcell .e-frozen-right-cursor,
678-
// .e-gridheader .e-headercell .e-frozen-right-cursor {
679-
// left: 0;
680-
// }
681-
682-
// .e-gridheader .e-headercell .e-frozen-left-cursor.e-frozen-resize-cursor {
683-
// right: 3px;
684-
// }
685-
686-
// .e-gridheader .e-headercell .e-frozen-right-cursor.e-frozen-resize-cursor {
687-
// left: 3px;
688-
// }
689-
690-
// .e-frozen-helper {
691-
// border-left: $grid-freezeline-border $grid-freezeline-right-border;
692-
// cursor: move;
693-
// position: absolute;
694-
// z-index: 2;
695-
// }
696-
697-
// .e-content.e-freezeline-moving {
698-
// user-select: none
699-
// }
647+
.e-rowcell.e-frozen-right-border,
648+
.e-headercell.e-frozen-right-border,
649+
.e-filterbarcell.e-frozen-right-border {
650+
border-right: $grid-freezeline-border $grid-freezeline-right-border;
651+
}
652+
653+
.e-rowcell.e-frozen-left-border,
654+
.e-headercell.e-frozen-left-border,
655+
.e-filterbarcell.e-frozen-left-border {
656+
border-left: $grid-freezeline-border $grid-freezeline-right-border;
657+
}
658+
659+
.e-rowcell.e-freezeline,
660+
.e-gridheader .e-filterbarcell.e-freezeline {
661+
position: relative;
662+
}
663+
664+
.e-rowcell .e-frozen-right-cursor,
665+
.e-rowcell .e-frozen-left-cursor,
666+
.e-gridheader .e-headercell .e-frozen-right-cursor,
667+
.e-gridheader .e-headercell .e-frozen-left-cursor,
668+
.e-gridheader .e-filterbarcell .e-frozen-right-cursor,
669+
.e-gridheader .e-filterbarcell .e-frozen-left-cursor {
670+
cursor: move;
671+
height: 100%;
672+
position: absolute;
673+
top: 0;
674+
width: 4px;
675+
}
676+
677+
.e-rowcell .e-frozen-left-cursor,
678+
.e-gridheader .e-headercell .e-frozen-left-cursor,
679+
.e-gridheader .e-filterbarcell .e-frozen-left-cursor {
680+
right: 0;
681+
}
682+
683+
.e-rowcell .e-frozen-right-cursor,
684+
.e-gridheader .e-headercell .e-frozen-right-cursor,
685+
.e-gridheader .e-filterbarcell .e-frozen-right-cursor {
686+
left: 0;
687+
}
688+
689+
.e-gridheader .e-headercell .e-frozen-left-cursor.e-frozen-resize-cursor,
690+
.e-gridheader .e-filterbarcell .e-frozen-left-cursor.e-frozen-resize-cursor,
691+
.e-rowcell .e-frozen-left-cursor.e-frozen-resize-cursor {
692+
right: 3px;
693+
}
694+
695+
.e-gridheader .e-headercell .e-frozen-right-cursor.e-frozen-resize-cursor:not(.e-frozen-default-cursor),
696+
.e-gridheader .e-filterbarcell .e-frozen-right-cursor.e-frozen-resize-cursor:not(.e-frozen-default-cursor) {
697+
left: 3px;
698+
}
699+
700+
.e-frozen-helper {
701+
border-left: $grid-freezeline-border $grid-freezeline-right-border;
702+
cursor: move;
703+
position: absolute;
704+
z-index: 2;
705+
}
706+
707+
.e-content.e-freezeline-moving {
708+
user-select: none
709+
}
700710
}
701711

702712
#{&}.e-grid {
@@ -1120,8 +1130,8 @@
11201130
width: 4px;
11211131
}
11221132

1123-
& .e-gridheader .e-frozenheader .e-headercell .e-rhandler:last-of-type,
1124-
& .e-gridheader .e-frozenheader .e-headercell .e-rsuppress:last-of-type {
1133+
& .e-gridheader .e-frozenheader .e-headercell:last-child .e-rhandler:last-of-type,
1134+
& .e-gridheader .e-frozenheader .e-headercell:last-child .e-rsuppress:last-of-type {
11251135
border-right: 0;
11261136
}
11271137

@@ -1561,9 +1571,9 @@
15611571

15621572
&.e-default tr {
15631573
& td:first-child,
1564-
& th.e-headercell:first-child:not(.e-firstcell),
1574+
& th.e-headercell:first-child:not(.e-firstcell):not(.e-headercell.e-frozen-left-border),
15651575
& th.e-detailheadercell:first-child,
1566-
& th.e-filterbarcell:first-child {
1576+
& th.e-filterbarcell:first-child:not(.e-filterbarcell.e-frozen-left-border) {
15671577
border-left-width: 0;
15681578
}
15691579
}
@@ -2680,7 +2690,10 @@
26802690
}
26812691

26822692
.e-frozenheader.e-frozen-right-header > .e-table,
2683-
.e-frozencontent.e-frozen-right-content > .e-table {
2693+
.e-frozencontent.e-frozen-right-content > .e-table,
2694+
.e-rowcell .e-frozen-default-cursor,
2695+
.e-gridheader .e-headercell .e-frozen-default-cursor,
2696+
.e-gridheader .e-filterbarcell .e-frozen-default-cursor {
26842697
border-left: $frozen-border;
26852698
border-right: 0;
26862699
}
@@ -3402,59 +3415,69 @@
34023415
border-spacing: .25px;
34033416
}
34043417

3405-
// .e-rowcell.e-frozen-right-border,
3406-
// .e-headercell.e-frozen-right-border {
3407-
// border-right: $grid-freezeline-border $grid-freezeline-right-border;
3408-
// }
3409-
3410-
// .e-rowcell.e-frozen-left-border,
3411-
// .e-headercell.e-frozen-left-border {
3412-
// border-left: $grid-freezeline-border $grid-freezeline-right-border;
3413-
// }
3414-
3415-
// .e-rowcell.e-freezeline {
3416-
// position: relative;
3417-
// }
3418-
3419-
// .e-rowcell .e-frozen-right-cursor,
3420-
// .e-rowcell .e-frozen-left-cursor,
3421-
// .e-gridheader .e-headercell .e-frozen-right-cursor,
3422-
// .e-gridheader .e-headercell .e-frozen-left-cursor {
3423-
// cursor: move;
3424-
// height: 100%;
3425-
// position: absolute;
3426-
// top: 0;
3427-
// width: 4px;
3428-
// }
3429-
3430-
// .e-rowcell .e-frozen-left-cursor,
3431-
// .e-gridheader .e-headercell .e-frozen-left-cursor {
3432-
// right: 0;
3433-
// }
3434-
3435-
// .e-rowcell .e-frozen-right-cursor,
3436-
// .e-gridheader .e-headercell .e-frozen-right-cursor {
3437-
// left: 0;
3438-
// }
3439-
3440-
// .e-gridheader .e-headercell .e-frozen-left-cursor.e-frozen-resize-cursor {
3441-
// right: 3px;
3442-
// }
3443-
3444-
// .e-gridheader .e-headercell .e-frozen-right-cursor.e-frozen-resize-cursor {
3445-
// left: 3px;
3446-
// }
3447-
3448-
// .e-frozen-helper {
3449-
// border-left: $grid-freezeline-border $grid-freezeline-right-border;
3450-
// cursor: move;
3451-
// position: absolute;
3452-
// z-index: 2;
3453-
// }
3454-
3455-
// .e-content.e-freezeline-moving {
3456-
// user-select: none;
3457-
// }
3418+
.e-rowcell.e-frozen-right-border,
3419+
.e-headercell.e-frozen-right-border,
3420+
.e-filterbarcell.e-frozen-right-border {
3421+
border-right: $grid-freezeline-border $grid-freezeline-right-border;
3422+
}
3423+
3424+
.e-rowcell.e-frozen-left-border,
3425+
.e-headercell.e-frozen-left-border,
3426+
.e-filterbarcell.e-frozen-left-border {
3427+
border-left: $grid-freezeline-border $grid-freezeline-right-border;
3428+
}
3429+
3430+
.e-rowcell.e-freezeline,
3431+
.e-gridheader .e-filterbarcell.e-freezeline {
3432+
position: relative;
3433+
}
3434+
3435+
.e-rowcell .e-frozen-right-cursor,
3436+
.e-rowcell .e-frozen-left-cursor,
3437+
.e-gridheader .e-headercell .e-frozen-right-cursor,
3438+
.e-gridheader .e-headercell .e-frozen-left-cursor,
3439+
.e-gridheader .e-filterbarcell .e-frozen-right-cursor,
3440+
.e-gridheader .e-filterbarcell .e-frozen-left-cursor {
3441+
cursor: move;
3442+
height: 100%;
3443+
position: absolute;
3444+
top: 0;
3445+
width: 4px;
3446+
}
3447+
3448+
.e-rowcell .e-frozen-left-cursor,
3449+
.e-gridheader .e-headercell .e-frozen-left-cursor,
3450+
.e-gridheader .e-filterbarcell .e-frozen-left-cursor {
3451+
right: 0;
3452+
}
3453+
3454+
.e-rowcell .e-frozen-right-cursor,
3455+
.e-gridheader .e-headercell .e-frozen-right-cursor,
3456+
.e-gridheader .e-filterbarcell .e-frozen-right-cursor {
3457+
left: 0;
3458+
}
3459+
3460+
.e-gridheader .e-headercell .e-frozen-left-cursor.e-frozen-resize-cursor,
3461+
.e-gridheader .e-filterbarcell .e-frozen-left-cursor.e-frozen-resize-cursor,
3462+
.e-rowcell .e-frozen-left-cursor.e-frozen-resize-cursor {
3463+
right: 3px;
3464+
}
3465+
3466+
.e-gridheader .e-headercell .e-frozen-right-cursor.e-frozen-resize-cursor:not(.e-frozen-default-cursor),
3467+
.e-gridheader .e-filterbarcell .e-frozen-right-cursor.e-frozen-resize-cursor:not(.e-frozen-default-cursor) {
3468+
left: 3px;
3469+
}
3470+
3471+
.e-frozen-helper {
3472+
border-left: $grid-freezeline-border $grid-freezeline-right-border;
3473+
cursor: move;
3474+
position: absolute;
3475+
z-index: 2;
3476+
}
3477+
3478+
.e-content.e-freezeline-moving {
3479+
user-select: none;
3480+
}
34583481

34593482
.e-masked-cell.e-rowcell .e-virtualcell {
34603483
background-color: $grid-maskedcell-virtual-background-color;

0 commit comments

Comments
 (0)