Skip to content

Commit 2fb9bf3

Browse files
author
pipeline
committed
v21.2.8 is released
1 parent 14be011 commit 2fb9bf3

File tree

2,279 files changed

+20780
-4724
lines changed

Some content is hidden

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

2,279 files changed

+20780
-4724
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+
## 21.1.35 (2023-05-9)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `#I451675` - The issue in the `template engine` when using `boolean` value has been resolved.
12+
513
## 21.2.3 (2023-05-03)
614

715
### Common

‎controls/base/spec/template.spec.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ let arrayOfObj = [
3131
}
3232
];
3333
let specialCharValue = [{'@ShipCountry': 'France'}];
34+
let dsJSONArrayBoolean: any=[{name: true,info:{ id:'01'} }, { name: false, info: { id:'02'} }]
3435
let dsJSONArray: any = [{ name: 'one', info: { id: '01' } }, { name: 'two', info: { id: '02' } }];
3536
let dsSubArray: any = [{ name: 'one', items: ['AR Item1', 'AR Item2'] }, { name: 'two', items: ['AR Item1', 'AR Item2'] }];
3637
let dsJSONSubArray: any = [{ name: 'one', info: { id: '01', items: ['AR Item1', 'AR Item2'] } }, { name: 'two', info: { id: '02', items: ['AR Item1', 'AR Item2'] } }];
@@ -255,6 +256,14 @@ describe('Template', () => {
255256
expect(outDOM(template.compile(templateStr), dsJSONArray)).toEqual(result);
256257
});
257258

259+
it('JSON Array Input With IF ELSE Condition Boolean', () => {
260+
let templateStr: string = '<div>${if(name===true)}${info.id}${else}${name}${/if}</div>';
261+
let result: Element[] = [];
262+
result.push(createElement('div', { innerHTML: '01' }));
263+
result.push(createElement('div', { innerHTML: 'false' }));
264+
expect(outDOM(template.compile(templateStr), dsJSONArrayBoolean)).toEqual(result);
265+
});
266+
258267
it('JSON Array Input With Multiple IF Condition', () => {
259268
let templateStr: string = '<div>${if(name=="one" && info.id != "01")}${info.id}${/if}</div>';
260269
let result: Element[] = [];

‎controls/base/src/template.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ function evalExp(str: string, nameSpace: string, helper?: Object, ignorePrefix?:
236236
* @returns {string} ?
237237
*/
238238
function addNameSpace(str: string, addNS: boolean, nameSpace: string, ignoreList: string[], ignorePrefix: boolean): string {
239-
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1 && !ignorePrefix) ? nameSpace + '.' + str : str);
239+
return ((addNS && !(NOT_NUMBER.test(str)) && ignoreList.indexOf(str.split('.')[0]) === -1 && !ignorePrefix && str !== "true" && str !== "false") ? nameSpace + '.' + str : str);
240240
}
241241

242242
/**

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,12 @@ $grid-bigger-headercell-font-size: 15px !default;
333333
$grid-bigger-content-font-size: 14px !default;
334334
$grid-filterbar-border-radius: 4px !default;
335335
$grid-bigger-sorticon-margin-top: -4px !default;
336+
$grid-device-group-sorticon-margin-top: -1px !default;
336337
$grid-header-border-width: 0 !default;
337338
$grid-bigger-groupedcell-padding: 5px 0 8px !default;
338339
$grid-bigger-group-headercell-margin: 4px 0 0 10px !default;
339340
$grid-bigger-group-headercell-padding: 9px 0 !default;
341+
$grid-device-group-headercell-padding: 9px 0 !default;
340342
$grid-bigger-grouptext-marign: 0 !default;
341343
$grid-bigger-headercell-padding: 8px !default;
342344
$grid-bigger-icons-font-size: 14px !default;
@@ -346,8 +348,10 @@ $grid-bigger-grouped-headercell-border-radius: 6px !default;
346348
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
347349
$grid-bigger-ungroupbutton-icons-font-size: 14px !default;
348350
$grid-bigger-groupcell-span-padding: 0 8px !default;
351+
$grid-device-grouped-headercell-span-padding: 0 8px !default;
349352
$grid-bigger-ungroupbutton-icon-margin-left: -7px !default;
350353
$grid-bigger-ungroupbutton-icon-margin-top: -3px !default;
354+
$grid-device-ungroupbutton-icon-margin-top: -3px !default;
351355
$grid-bigger-groupcell-span-line-height: 37px !default;
352356
$grid-bigger-gdownarrow-icon-font-size: 14px !default;
353357
$grid-gd-clone-border-radius: 4px !default;
@@ -589,6 +593,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
589593
$grid-cc-margin-top: 2px !default;
590594
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
591595
$grid-bigger-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
596+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
592597
$grid-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
593598
$grid-ungroup-rtl-padding-left: 8px !default;
594599
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,12 @@ $grid-bigger-headercell-font-size: 15px !default;
337337
$grid-bigger-content-font-size: 14px !default;
338338
$grid-filterbar-border-radius: 4px !default;
339339
$grid-bigger-sorticon-margin-top: -4px !default;
340+
$grid-device-group-sorticon-margin-top: -1px !default;
340341
$grid-header-border-width: 0 !default;
341342
$grid-bigger-groupedcell-padding: 5px 0 8px !default;
342343
$grid-bigger-group-headercell-margin: 6px 0 0 12px !default;
343344
$grid-bigger-group-headercell-padding: 9px 0 !default;
345+
$grid-device-group-headercell-padding: 9px 0 !default;
344346
$grid-bigger-grouptext-marign: 0 !default;
345347
$grid-bigger-headercell-padding: 8px !default;
346348
$grid-bigger-icons-font-size: 14px !default;
@@ -350,8 +352,10 @@ $grid-bigger-grouped-headercell-border-radius: 6px !default;
350352
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
351353
$grid-bigger-ungroupbutton-icons-font-size: 14px !default;
352354
$grid-bigger-groupcell-span-padding: 0 8px !default;
355+
$grid-device-grouped-headercell-span-padding: 0 8px !default;
353356
$grid-bigger-ungroupbutton-icon-margin-left: -7px !default;
354357
$grid-bigger-ungroupbutton-icon-margin-top: -3px !default;
358+
$grid-device-ungroupbutton-icon-margin-top: -3px !default;
355359
$grid-bigger-groupcell-span-line-height: 37px !default;
356360
$grid-bigger-gdownarrow-icon-font-size: 14px !default;
357361
$grid-gd-clone-border-radius: 4px !default;
@@ -591,6 +595,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
591595
$grid-cc-margin-top: 2px !default;
592596
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
593597
$grid-bigger-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
598+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
594599
$grid-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
595600
$grid-ungroup-rtl-padding-left: 8px !default;
596601
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,12 @@ $grid-bigger-headercell-font-size: 16px !default;
338338
$grid-bigger-content-font-size: 16px !default;
339339
$grid-filterbar-border-radius: 4px !default;
340340
$grid-bigger-sorticon-margin-top: -1px !default;
341+
$grid-device-group-sorticon-margin-top: 0 !default;
341342
$grid-header-border-width: 0 !default;
342343
$grid-bigger-groupedcell-padding: 2px 8px 8px !default;
343344
$grid-bigger-group-headercell-margin: 15px 0 0 10px !default;
344345
$grid-bigger-group-headercell-padding: 6px 0 !default;
346+
$grid-device-group-headercell-padding: 0 !default;
345347
$grid-bigger-grouptext-marign: 0 !default;
346348
$grid-bigger-headercell-padding: 12px !default;
347349
$grid-bigger-icons-font-size: 16px !default;
@@ -351,9 +353,11 @@ $grid-bigger-grouped-headercell-border-radius: 6px !default;
351353
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
352354
$grid-bigger-ungroupbutton-icons-font-size: 12px !default;
353355
$grid-bigger-groupcell-span-padding: 8px 4px 10px 12px !default;
356+
$grid-device-grouped-headercell-span-padding: 0 4px 0 12px !default;
354357
$grid-bigger-ungroupbutton-icon-margin-left: -7px !default;
355358
$grid-bigger-ungroupbutton-icon-margin-top: -1px !default;
356-
$grid-bigger-groupcell-span-line-height: 4px !default;
359+
$grid-device-ungroupbutton-icon-margin-top: -1px !default;
360+
$grid-bigger-groupcell-span-line-height: 24px !default;
357361
$grid-bigger-gdownarrow-icon-font-size: 12px !default;
358362
$grid-gd-clone-border-radius: 4px !default;
359363
$grid-bigger-group-clone-broder-radius: 6px !default;
@@ -595,6 +599,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
595599
$grid-cc-margin-top: 0 !default;
596600
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
597601
$grid-bigger-rtl-group-span-padding: 8px 4px 10px 8px !default;
602+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
598603
$grid-rtl-group-span-padding: 0 8px !default;
599604
$grid-ungroup-rtl-padding-left: 12px !default;
600605
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,12 @@ $grid-bigger-headercell-font-size: $text-base !default;
334334
$grid-bigger-content-font-size: $text-base !default;
335335
$grid-filterbar-border-radius: 4px !default;
336336
$grid-bigger-sorticon-margin-top: 1px !default;
337+
$grid-device-group-sorticon-margin-top: 0 !default;
337338
$grid-header-border-width: 0 !default;
338339
$grid-bigger-groupedcell-padding: 0 0 8px !default;
339340
$grid-bigger-group-headercell-margin: 8px 0 0 8px !default;
340341
$grid-bigger-group-headercell-padding: 7px 0 !default;
342+
$grid-device-group-headercell-padding: 0 !default;
341343
$grid-bigger-grouptext-marign: 0 !default;
342344
$grid-bigger-headercell-padding: 12px !default;
343345
$grid-bigger-icons-font-size: $text-base !default;
@@ -347,8 +349,10 @@ $grid-bigger-grouped-headercell-border-radius: 0 !default;
347349
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
348350
$grid-bigger-ungroupbutton-icons-font-size: $text-base !default;
349351
$grid-bigger-groupcell-span-padding: 0 8px !default;
352+
$grid-device-grouped-headercell-span-padding: 0 8px !default;
350353
$grid-bigger-ungroupbutton-icon-margin-left: -12px !default;
351354
$grid-bigger-ungroupbutton-icon-margin-top: 1px !default;
355+
$grid-device-ungroupbutton-icon-margin-top: 0 !default;
352356
$grid-bigger-groupcell-span-line-height: 24px !default;
353357
$grid-bigger-gdownarrow-icon-font-size: $text-base !default;
354358
$grid-gd-clone-border-radius: 4px !default;
@@ -590,6 +594,7 @@ $grid-adaptive-sort-clear-button-padding: 4px !default;
590594
$grid-cc-margin-top: 4px !default;
591595
$grid-bigger-rtl-cm-margin: -12px 4px -12px -22px !default;
592596
$grid-bigger-rtl-group-span-padding: 0 8px !default;
597+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
593598
$grid-rtl-group-span-padding: 0 8px !default;
594599
$grid-ungroup-rtl-padding-left: 8px !default;
595600
$grid-column-reorder-icon-color: $primary !default;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ $grid-bigger-columnchooser-header-padding: 24px 24px 38px !default;
109109
$grid-bigger-columnchooser-ul-padding: 0 !default;
110110
$grid-bigger-columnchooser-toolbar-div-margin-top: 0 !default;
111111
$grid-bigger-sorticon-margin-top: 0 !default;
112+
$grid-device-group-sorticon-margin-top: 0 !default;
112113
$grid-bigger-groupcell-span-padding: 0 !default;
114+
$grid-device-grouped-headercell-span-padding: 0 !default;
113115
$grid-bigger-ungroupbutton-icon-margin-left: 0 !default;
114116
$grid-device-gridheader-row-span-padding: 20px !default;
115117
$frozen-border: 2px solid !default;
@@ -312,9 +314,11 @@ $grid-bigger-groupcaption-line-height: 27px !default;
312314
$grid-bigger-grouped-headercell-border-radius: 0 !default;
313315
$grid-bigger-group-headercell-margin: 9px 0 0 10px !default;
314316
$grid-bigger-group-headercell-padding: 0 10px !default;
317+
$grid-device-group-headercell-padding: 0 10px !default;
315318
$grid-bigger-ungroup-button-font-size: 13px !default;
316319
$grid-bigger-ungroupbutton-icons-font-size: 13px !default;
317320
$grid-bigger-ungroupbutton-icon-margin-top: 1px !default;
321+
$grid-device-ungroupbutton-icon-margin-top: 1px !default;
318322
$grid-bigger-grouparea-font-size: 21px !default;
319323
$grid-bigger-rtl-group-headercell-margin: 8px 10px 0 0 !default;
320324
$grid-bigger-rtl-group-headercell-padding: 0 10px !default;
@@ -587,6 +591,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
587591
$grid-cc-margin-top: 3px !default;
588592
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
589593
$grid-bigger-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
594+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
590595
$grid-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
591596
$grid-ungroup-rtl-padding-left: 0 !default;
592597
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ $grid-bigger-columnchooser-header-padding: 24px 24px 38px !default;
113113
$grid-bigger-columnchooser-ul-padding: 0 !default;
114114
$grid-bigger-columnchooser-toolbar-div-margin-top: 0 !default;
115115
$grid-bigger-sorticon-margin-top: 0 !default;
116+
$grid-device-group-sorticon-margin-top: 0 !default;
116117
$grid-bigger-groupcell-span-padding: 0 !default;
118+
$grid-device-grouped-headercell-span-padding: 0 !default;
117119
$grid-bigger-ungroupbutton-icon-margin-left: 0 !default;
118120
$grid-device-gridheader-row-span-padding: 20px !default;
119121
$frozen-border: 2px solid !default;
@@ -315,9 +317,11 @@ $grid-bigger-groupcaption-line-height: 27px !default;
315317
$grid-bigger-grouped-headercell-border-radius: 0 !default;
316318
$grid-bigger-group-headercell-margin: 9px 0 0 10px !default;
317319
$grid-bigger-group-headercell-padding: 0 10px !default;
320+
$grid-device-group-headercell-padding: 0 10px !default;
318321
$grid-bigger-ungroup-button-font-size: 13px !default;
319322
$grid-bigger-ungroupbutton-icons-font-size: 13px !default;
320323
$grid-bigger-ungroupbutton-icon-margin-top: 0 !default;
324+
$grid-device-ungroupbutton-icon-margin-top: 0 !default;
321325
$grid-bigger-grouparea-font-size: 21px !default;
322326
$grid-bigger-rtl-group-headercell-margin: 8px 10px 0 0 !default;
323327
$grid-bigger-rtl-group-headercell-padding: 0 10px !default;
@@ -587,6 +591,7 @@ $grid-adaptive-sort-clear-button-padding: 5px !default;
587591
$grid-cc-margin-top: 3px !default;
588592
$grid-bigger-rtl-cm-margin: $grid-rtl-column-menu-margin !default;
589593
$grid-bigger-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
594+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
590595
$grid-rtl-group-span-padding: $grid-bigger-groupcell-span-padding !default;
591596
$grid-ungroup-rtl-padding-left: 0 !default;
592597
$grid-column-reorder-icon-color: $grid-icon-default-color !default;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,12 @@ $grid-bigger-headercell-font-size: $text-base !default;
358358
$grid-bigger-content-font-size: $text-base !default;
359359
$grid-filterbar-border-radius: 4px !default;
360360
$grid-bigger-sorticon-margin-top: -4px !default;
361+
$grid-device-group-sorticon-margin-top: 0 !default;
361362
$grid-header-border-width: 0 !default;
362363
$grid-bigger-groupedcell-padding: 0 !default;
363364
$grid-bigger-group-headercell-margin: 6px 0 6px 8px !default;
364365
$grid-bigger-group-headercell-padding: 6px 0 !default;
366+
$grid-device-group-headercell-padding: 0 !default;
365367
$grid-bigger-grouptext-marign: 0 !default;
366368
$grid-bigger-headercell-padding: 12px !default;
367369
$grid-bigger-icons-font-size: $text-base !default;
@@ -371,8 +373,10 @@ $grid-bigger-grouped-headercell-border-radius: 0 !default;
371373
$grid-bigger-groupedcell-icons-marign-left: -8px !default;
372374
$grid-bigger-ungroupbutton-icons-font-size: $text-base !default;
373375
$grid-bigger-groupcell-span-padding: 8px 4px 14px 12px !default;
376+
$grid-device-grouped-headercell-span-padding: 0 8px !default;
374377
$grid-bigger-ungroupbutton-icon-margin-left: 0 !default;
375378
$grid-bigger-ungroupbutton-icon-margin-top: -4px !default;
379+
$grid-device-ungroupbutton-icon-margin-top: 0 !default;
376380
$grid-bigger-groupcell-span-line-height: 30px !default;
377381
$grid-bigger-gdownarrow-icon-font-size: $text-lg !default;
378382
$grid-gd-clone-border-radius: 4px !default;
@@ -583,6 +587,7 @@ $grid-adaptive-sort-clear-button-padding: 4px !default;
583587
$grid-cc-margin-top: 2px !default;
584588
$grid-bigger-rtl-cm-margin: -20px -18px -5px -22px !default;
585589
$grid-bigger-rtl-group-span-padding: 11.5px 4px 14px 4px !default;
590+
$grid-device-rtl-grouped-headercell-span-padding: $grid-device-grouped-headercell-span-padding !default;
586591
$grid-rtl-group-span-padding: 4px 12px 4px 8px !default;
587592
$grid-ungroup-rtl-padding-left: 8px !default;
588593
$grid-bigger-headercell-top-padding: 0 !default;

0 commit comments

Comments
 (0)