Skip to content

Commit 8d8e936

Browse files
author
pipeline
committed
v19.2.60 is released
1 parent 9066901 commit 8d8e936

File tree

135 files changed

+1942
-1013
lines changed

Some content is hidden

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

135 files changed

+1942
-1013
lines changed

‎controls/base/CHANGELOG.md

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

33
## [Unreleased]
44

5+
## 19.2.60 (2021-09-07)
6+
7+
### Common
8+
9+
#### Bug Fixes
10+
11+
- `F168046` - Resolved Template Compilation malfunction when value have hyphen special character.
12+
- `I339954` - Resolved the issue with Template compilation malfunctions when `href` value is empty.
13+
514
## 19.2.51 (2021-08-03)
615

716
### Common

‎controls/base/src/template.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const CALL_FUNCTION: RegExp = new RegExp('\\((.*)\\)', '');
1313
const NOT_NUMBER: RegExp = new RegExp('^[0-9]+$', 'g');
1414
const WORD: RegExp = new RegExp('[\\w"\'.\\s+]+', 'g');
1515
const DBL_QUOTED_STR: RegExp = new RegExp('"(.*?)"', 'g');
16-
const WORDIF: RegExp = new RegExp('[\\w"\'@#$.\\s+]+', 'g');
16+
const WORDIF: RegExp = new RegExp('[\\w"\'@#$.\\s-+]+', 'g');
1717
let exp: RegExp = new RegExp('\\${([^}]*)}', 'g');
1818
// let cachedTemplate: Object = {};
1919
let ARR_OBJ: RegExp = /^\..*/gm;
@@ -73,16 +73,18 @@ export function compile(template: string, helper?: Object, ignorePrefix?: boolea
7373
}
7474
str = str.replace(str, str1);
7575
}
76-
else if(str.match(hrefRegex)) {
77-
var check = str.match(hrefRegex);
78-
var str1 = str;
79-
for (var i=0; i < check.length; i++) {
80-
var check1 = str.match(hrefRegex)[i].split('href=')[1];
81-
var change = check1.match(/^'/) !== null ? check1.replace(/^'/, '\"') : check1;
82-
change =change.match(/.$/)[0] === '\\'' ? change.replace(/.$/,'\"') : change;
83-
str1 = str1.replace(check1, change);
76+
else if (str.match(/(?:href='')/) === null) {
77+
if(str.match(hrefRegex)) {
78+
var check = str.match(hrefRegex);
79+
var str1 = str;
80+
for (var i=0; i < check.length; i++) {
81+
var check1 = str.match(hrefRegex)[i].split('href=')[1];
82+
var change = check1.match(/^'/) !== null ? check1.replace(/^'/, '\"') : check1;
83+
change =change.match(/.$/)[0] === '\\'' ? change.replace(/.$/,'\"') : change;
84+
str1 = str1.replace(check1, change);
85+
}
86+
str = str.replace(str, str1);
8487
}
85-
str = str.replace(str, str1);
8688
}
8789
`;
8890
let fnCode: string = "var str=\"" + evalExpResult + "\";" + condtion + " return str;";

‎controls/buttons/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 19.2.59 (2021-08-31)
5+
## 19.2.60 (2021-09-07)
66

77
### Checkbox
88

‎controls/charts/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+
## 19.2.60 (2021-09-07)
6+
7+
### Chart
8+
9+
#### Bug Fixes
10+
11+
- `#I340525` - Data labels are rendering fine when the background is specified for the chart.
12+
513
## 19.2.59 (2021-08-31)
614

715
### Chart

‎controls/charts/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-charts",
3-
"version": "19.2.57",
3+
"version": "19.2.59",
44
"description": "Feature-rich chart control with built-in support for over 25 chart types, technical indictors, trendline, zooming, tooltip, selection, crosshair and trackball.",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

‎controls/charts/spec/chart/scrollbar/scrollbar-multiple.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ describe('Scrollbar Chart', () => {
9797
let svgChildEleX: Element = document.getElementById('container_scrollBar_svgprimaryXAxis').children[0];
9898
let thumbRectEleX: Element = svgChildEleX.children[1].children[0];
9999
expect(parseInt(thumbRectEleX.getAttribute('x'), 10) === 156
100+
|| parseInt(thumbRectEleX.getAttribute('x'), 10) === 160
100101
|| parseInt(thumbRectEleX.getAttribute('x'), 10) === 161).toBe(true);
101102
expect(thumbRectEleX.getAttribute('y') === '0').toBe(true);
102103
expect(thumbRectEleX.getAttribute('height') === '16').toBe(true);
@@ -119,13 +120,16 @@ describe('Scrollbar Chart', () => {
119120
let svgChildEleX: Element = document.getElementById('container_scrollBar_svgprimaryXAxis').children[0];
120121
let thumbRectEleX: Element = svgChildEleX.children[1].children[0];
121122
let xAxisThumbX: string = thumbRectEleX.getAttribute('x');
122-
expect(parseInt(xAxisThumbX, 10) === 158 || parseInt(xAxisThumbX, 10) === 162).toBe(true);
123+
expect(parseInt(xAxisThumbX, 10) === 158 || parseInt(xAxisThumbX, 10) === 160
124+
|| parseInt(xAxisThumbX, 10) === 162).toBe(true);
123125
expect(thumbRectEleX.getAttribute('y') === '0').toBe(true);
124126
expect(thumbRectEleX.getAttribute('height') === '16').toBe(true);
125127
expect(thumbRectEleX.getAttribute('width') === '40').toBe(true);
126128
let svgChildEleY: Element = document.getElementById('container_scrollBar_svgprimaryYAxis').children[0];
127129
let thumbRectEleY: Element = svgChildEleY.children[1].children[0];
128-
expect(thumbRectEleY.getAttribute('x') === '78.55342288032391' || thumbRectEleY.getAttribute('x') === '84.20412681155729').toBe(true);
130+
expect(parseInt(thumbRectEleY.getAttribute('x'), 10) === 78 ||
131+
parseInt(thumbRectEleY.getAttribute('x'), 10) === 84 ||
132+
parseInt(thumbRectEleY.getAttribute('x'), 10) === 83).toBe(true);
129133
expect(thumbRectEleY.getAttribute('y') === '0').toBe(true);
130134
expect(thumbRectEleY.getAttribute('height') === '16').toBe(true);
131135
expect(thumbRectEleY.getAttribute('width') === '40').toBe(true);

‎controls/charts/src/chart/chart.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3777,6 +3777,7 @@ export class Chart extends Component<HTMLElement> implements INotifyPropertyChan
37773777
}
37783778
}
37793779
if (!refreshBounds && renderer) {
3780+
this.rotatedDataLabelCollections = [];
37803781
this.removeSvg();
37813782
this.renderElements();
37823783
this.trigger('loaded', { chart: this.isBlazor ? {} : this });

‎controls/charts/src/chart/user-interaction/zooming.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export class Zoom {
279279
argsData.currentZoomFactor *= (zoomRect.height / bounds.height);
280280
}
281281
}
282-
if (parseFloat(axis.zoomFactor.toFixed(3)) <= 0.001) {
282+
if (parseFloat(argsData.currentZoomFactor.toFixed(3)) <= 0.001) {
283283
argsData.currentZoomFactor = argsData.previousZoomFactor;
284284
argsData.currentZoomPosition = argsData.previousZoomPosition;
285285
}

‎controls/circulargauge/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## [Unreleased]
66

7-
## 19.2.59 (2021-08-31)
7+
## 19.2.60 (2021-09-07)
88

99
### CircularGauge
1010

‎controls/data/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 19.2.59 (2021-08-31)
5+
## 19.2.48 (2021-07-20)
66

77
### DataManager
88

‎controls/data/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-data",
3-
"version": "17.2.48",
3+
"version": "19.2.55",
44
"description": "Essential JS 2 DataManager",
55
"author": "Syncfusion Inc.",
66
"license": "SEE LICENSE IN license",

‎controls/data/spec/adaptors.spec.ts

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Test case for dataManager
33
*/
44
import { DataManager, ReturnOption, RequestOptions } from '../src/manager';
5-
import { JsonAdaptor, RemoteSaveAdaptor, WebMethodAdaptor, UrlAdaptor, CustomDataAdaptor } from '../src/adaptors';
5+
import { JsonAdaptor, RemoteSaveAdaptor, WebMethodAdaptor, UrlAdaptor, CustomDataAdaptor, GraphQLAdaptor } from '../src/adaptors';
66
import { ODataAdaptor, ODataV4Adaptor, WebApiAdaptor, CacheAdaptor } from '../src/adaptors';
77
import { Query, Predicate } from '../src/query';
88
import { DataUtil } from '../src/util';
@@ -3954,4 +3954,70 @@ describe('EJ2-37998 - Provide support for delete action while using complex data
39543954
});
39553955
});
39563956

3957+
describe('GraphQLAdaptor Adaptor', () => {
3958+
let dataManager: DataManager;
3959+
let result: any;
3960+
let data: Object = {
3961+
data: {
3962+
getOrders: {
3963+
result: [
3964+
{ OrderID: 10248, CustomerID: 'VINET', EmployeeID: 7, Freight: 32.38, Guid: 'f89dee73-af9f-4cd4-b330-db93c25ff3c7' },
3965+
{ OrderID: 10249, CustomerID: 'AANAR', EmployeeID: 2, Freight: 11.61, Guid: 'db2d2186-1c29-4d1e-88ef-a127f521b9c6' },
3966+
{ OrderID: 10250, CustomerID: 'VICTE', EmployeeID: 7, Freight: 65.83, Guid: '6F9619FF-8B86-D011-B42D-00C04FC964FF' },
3967+
{ OrderID: 10251, CustomerID: 'VINET', EmployeeID: 7, Freight: 70.63, Guid: 'f89dee73-af9f-4cd4-b330-db93c25ff3c7' },
3968+
{ OrderID: 10252, CustomerID: 'SUPRD', EmployeeID: 6, Freight: 45.45, Guid: 'f89dee73-af9f-4cd4-b330-db93c25ff3c9' }
3969+
],
3970+
count: 5
3971+
}
3972+
}
3973+
};
3974+
describe('Get Data', () => {
3975+
let adaptor = new GraphQLAdaptor({
3976+
response: {
3977+
result: 'getOrders.result'
3978+
},
3979+
query: `query DataFetch($datamanager: String) {
3980+
getOrders(datamanager: $datamanager) {
3981+
count,
3982+
result{OrderID, CustomerID, EmployeeID, ShipCity, ShipCountry}
3983+
}
3984+
}`,
3985+
});
3986+
beforeAll((done: Function) => {
3987+
jasmine.Ajax.install();
3988+
dataManager = new DataManager({
3989+
url: 'Home/Employee',
3990+
adaptor: adaptor
3991+
});
3992+
let promise: Promise<Object> = dataManager.executeQuery(new Query().page(2, 3).take(5));
3993+
let request: JasmineAjaxRequest = jasmine.Ajax.requests.mostRecent();
3994+
request.respondWith({
3995+
'status': 200,
3996+
'contentType': 'application/json',
3997+
'responseText': JSON.stringify(data)
3998+
});
3999+
promise.then((e: { result: {result: Object[], count: number} }) => {
4000+
result = e.result;
4001+
done();
4002+
});
4003+
});
4004+
afterAll(() => {
4005+
jasmine.Ajax.uninstall();
4006+
});
4007+
it('check length of the data', () => {
4008+
expect(result.length).toBe(5);
4009+
});
4010+
it('check the ProcessData method', () => {
4011+
let query: Query = new Query().skip(2).take(2).select(['OrderID', 'CustomerID', 'EmployeeID']).where('EmployeeID', 'equal', 7);
4012+
let datamanager: Object = new UrlAdaptor().processQuery(new DataManager({ url: '' }), query);
4013+
let dm: Object = JSON.parse(datamanager['data']);
4014+
dm['where'] = JSON.stringify(dm['where']);
4015+
let data: Object[] = DataUtil.processData(dm, result) as any;
4016+
expect(data.length).toBe(1);
4017+
});
4018+
});
4019+
afterAll(() => {
4020+
jasmine.Ajax.uninstall();
4021+
});
4022+
});
39574023
});

0 commit comments

Comments
 (0)