Skip to content

Commit 6052b68

Browse files
SyncfusionBuildSyncfusionBuild
authored
Merge pull request #479 from Syncfusion-Content/hotfix/hotfix-v26.1.35
DOCINFRA-2341_merged_using_automation
2 parents 7ce812c + 6cb5a26 commit 6052b68

File tree

21 files changed

+1593
-22
lines changed

21 files changed

+1593
-22
lines changed

‎ej2-react/code-snippet/grid/column-cs10/app/App.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent } from '@syncfusion/ej2-react-grids';
2-
import { Filter, Inject, Page, Sort, Group } from '@syncfusion/ej2-react-grids';
2+
import { Filter, Inject, Page, Sort, Group, Resize } from '@syncfusion/ej2-react-grids';
33
import * as React from 'react';
44
import { data } from './datasource';
55
function App() {
@@ -19,7 +19,7 @@ function App() {
1919
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right'/>
2020
<ColumnDirective field='ShipName' headerText='Ship Name' width='200'/>
2121
</ColumnsDirective>
22-
<Inject services={[Sort, ColumnMenu, Page, Filter, Group]}/>
22+
<Inject services={[Sort, ColumnMenu, Page, Filter, Group, Resize]}/>
2323
</GridComponent>
2424
</div>);
2525
}

‎ej2-react/code-snippet/grid/column-cs10/app/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ColumnDirective, ColumnMenu, ColumnMenuOpenEventArgs, ColumnsDirective, GridComponent } from '@syncfusion/ej2-react-grids';
2-
import { Column, ColumnMenuItemModel, Filter, FilterSettingsModel, Inject, Page, Sort, Group } from '@syncfusion/ej2-react-grids';
2+
import { Column, ColumnMenuItemModel, Filter, FilterSettingsModel, Inject, Page, Sort, Group, Resize } from '@syncfusion/ej2-react-grids';
33
import * as React from 'react';
44
import { data } from './datasource';
55

@@ -24,7 +24,7 @@ function App() {
2424
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right' />
2525
<ColumnDirective field='ShipName' headerText='Ship Name' width='200' />
2626
</ColumnsDirective>
27-
<Inject services={[Sort, ColumnMenu, Page, Filter, Group]} />
27+
<Inject services={[Sort, ColumnMenu, Page, Filter, Group, Resize]} />
2828
</GridComponent>
2929
</div>
3030
);

‎ej2-react/code-snippet/grid/column-cs7/app/App.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent } from '@syncfusion/ej2-react-grids';
22
import { Edit, Group } from '@syncfusion/ej2-react-grids';
3-
import { Filter, Inject, Page, Sort } from '@syncfusion/ej2-react-grids';
3+
import { Filter, Inject, Page, Sort, Resize } from '@syncfusion/ej2-react-grids';
44
import * as React from 'react';
55
import { data } from './datasource';
66
function App() {
@@ -14,7 +14,7 @@ function App() {
1414
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right'/>
1515
<ColumnDirective field='ShipName' headerText='Ship Name' width='200'/>
1616
</ColumnsDirective>
17-
<Inject services={[Sort, ColumnMenu, Filter, Page, Group, Edit]}/>
17+
<Inject services={[Sort, ColumnMenu, Filter, Page, Group, Edit, Resize]}/>
1818
</GridComponent>
1919
</div>;
2020
}

‎ej2-react/code-snippet/grid/column-cs7/app/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent, GroupSettingsModel } from '@syncfusion/ej2-react-grids';
44
import { Edit, Group } from '@syncfusion/ej2-react-grids';
5-
import { Filter, FilterSettingsModel, Inject, Page, Sort } from '@syncfusion/ej2-react-grids';
5+
import { Filter, FilterSettingsModel, Inject, Page, Sort, Resize } from '@syncfusion/ej2-react-grids';
66
import * as React from 'react';
77
import { data } from './datasource';
88

@@ -18,7 +18,7 @@ function App() {
1818
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right' />
1919
<ColumnDirective field='ShipName' headerText='Ship Name' width='200' />
2020
</ColumnsDirective>
21-
<Inject services={[Sort, ColumnMenu, Filter, Page, Group, Edit]} />
21+
<Inject services={[Sort, ColumnMenu, Filter, Page, Group, Edit, Resize]} />
2222
</GridComponent>
2323
</div>
2424
};

‎ej2-react/code-snippet/grid/column-cs8/app/App.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent } from '@syncfusion/ej2-react-grids';
44
import { Edit, ExcelExport } from '@syncfusion/ej2-react-grids';
5-
import { Filter, Inject, Page, PdfExport, Sort, Group } from '@syncfusion/ej2-react-grids';
5+
import { Filter, Inject, Page, PdfExport, Sort, Group, Resize } from '@syncfusion/ej2-react-grids';
66
import React, { useState } from 'react';
77
import { data } from './datasource';
88
function App() {
@@ -29,7 +29,7 @@ function App() {
2929
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right' />
3030
<ColumnDirective field='ShipName' headerText='Ship Name' width='200' />
3131
</ColumnsDirective>
32-
<Inject services={[Sort, ColumnMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group]} />
32+
<Inject services={[Sort, ColumnMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group, Resize]} />
3333
</GridComponent>
3434
</div>
3535
);

‎ej2-react/code-snippet/grid/column-cs8/app/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent, GroupSettingsModel } from '@syncfusion/ej2-react-grids';
44
import { Edit, ExcelExport } from '@syncfusion/ej2-react-grids';
5-
import { Filter, FilterSettingsModel, Inject, Page, PdfExport, Sort, Group } from '@syncfusion/ej2-react-grids';
5+
import { Filter, FilterSettingsModel, Inject, Page, PdfExport, Sort, Group, Resize } from '@syncfusion/ej2-react-grids';
66
import React, { useState } from 'react';
77
import { data } from './datasource';
88
function App() {
@@ -29,7 +29,7 @@ function App() {
2929
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right' />
3030
<ColumnDirective field='ShipName' headerText='Ship Name' width='200' />
3131
</ColumnsDirective>
32-
<Inject services={[Sort, ColumnMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group]} />
32+
<Inject services={[Sort, ColumnMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group, Resize]} />
3333
</GridComponent>
3434
</div>
3535
);

‎ej2-react/code-snippet/grid/context-menu-cs1/app/App.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ColumnDirective, ColumnsDirective, GridComponent } from '@syncfusion/ej2-react-grids';
2-
import { ContextMenu, Edit, Filter, Group, Inject, Page, Sort } from '@syncfusion/ej2-react-grids';
2+
import { ContextMenu, Edit, Filter, Group, Inject, Page, Sort, Resize } from '@syncfusion/ej2-react-grids';
33
import { ExcelExport, PdfExport } from '@syncfusion/ej2-react-grids';
44
import * as React from 'react';
55
import { data } from './datasource';
@@ -17,7 +17,7 @@ function App() {
1717
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right' editType='numericedit' width='140'/>
1818
<ColumnDirective field='ShipName' headerText='Ship Name' width='200'/>
1919
</ColumnsDirective>
20-
<Inject services={[Sort, ContextMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group]}/>
20+
<Inject services={[Sort, ContextMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group, Resize]}/>
2121
</GridComponent>
2222
</div>);
2323
}

‎ej2-react/code-snippet/grid/context-menu-cs1/app/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
import { ColumnDirective, ColumnsDirective, GridComponent } from '@syncfusion/ej2-react-grids';
4-
import { ContextMenu, Edit, EditSettingsModel, Filter, Group, Inject, Page, Sort } from '@syncfusion/ej2-react-grids';
4+
import { ContextMenu, Edit, EditSettingsModel, Filter, Group, Inject, Page, Sort, Resize } from '@syncfusion/ej2-react-grids';
55
import { ContextMenuItem, ExcelExport, PdfExport } from '@syncfusion/ej2-react-grids';
66
import * as React from 'react';
77
import { data } from './datasource';
@@ -23,7 +23,7 @@ function App() {
2323
<ColumnDirective field='Freight' headerText='Freight' format='C2' textAlign='Right' editType='numericedit' width='140' />
2424
<ColumnDirective field='ShipName' headerText='Ship Name' width='200' />
2525
</ColumnsDirective>
26-
<Inject services={[Sort, ContextMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group]} />
26+
<Inject services={[Sort, ContextMenu, Filter, Page, ExcelExport, Edit, PdfExport, Group, Resize]} />
2727
</GridComponent>
2828
</div>
2929
);

‎ej2-react/code-snippet/grid/custom-column-menu-icon-cs1/app/App.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent, Inject } from '@syncfusion/ej2-react-grids';
1+
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent, Inject, Resize } from '@syncfusion/ej2-react-grids';
22
import * as React from 'react';
33
import { data } from './datasource';
44
function App() {
@@ -11,7 +11,7 @@ function App() {
1111
<ColumnDirective field='Freight' headerText='Freight' width='100' format="C2"/>
1212
<ColumnDirective field='ShipCountry' headerText='Ship Country' width='100'/>
1313
</ColumnsDirective>
14-
<Inject services={[ColumnMenu]}/>
14+
<Inject services={[ColumnMenu, Resize]}/>
1515
</GridComponent>
1616
</div>;
1717
}

‎ej2-react/code-snippet/grid/custom-column-menu-icon-cs1/app/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent, Inject } from '@syncfusion/ej2-react-grids';
3+
import { ColumnDirective, ColumnMenu, ColumnsDirective, GridComponent, Inject, Resize } from '@syncfusion/ej2-react-grids';
44
import * as React from 'react';
55
import { data } from './datasource';
66

@@ -14,7 +14,7 @@ function App() {
1414
<ColumnDirective field='Freight' headerText='Freight' width='100' format="C2" />
1515
<ColumnDirective field='ShipCountry' headerText='Ship Country' width='100' />
1616
</ColumnsDirective>
17-
<Inject services={[ColumnMenu]} />
17+
<Inject services={[ColumnMenu, Resize]} />
1818
</GridComponent>
1919
</div>
2020
};

‎ej2-react/code-snippet/grid/excel-like-filter-cs6/app/App.jsx

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { ColumnDirective, ColumnsDirective } from '@syncfusion/ej2-react-grids';
2+
import { Filter, Page, Sort, GridComponent, Inject } from '@syncfusion/ej2-react-grids';
3+
import { DataManager, WebApiAdaptor } from '@syncfusion/ej2-data';
4+
import * as React from 'react';
5+
import { orderData } from './datasource';
6+
function App() {
7+
const FilterOptions = {
8+
type: 'Excel'
9+
};
10+
const pageOptions = { pageSize: 12 }
11+
const actionBegin = (args) => {
12+
const hostUrl = 'https://services.syncfusion.com/react/production/';
13+
if (args.requestType === "filterBeforeOpen") {
14+
// Assign custom remote data source to the filter module data source
15+
args.filterModel.options.dataSource = new DataManager({ url: hostUrl + 'api/Orders', adaptor: new WebApiAdaptor });
16+
}
17+
}
18+
return <GridComponent dataSource={orderData} filterSettings={FilterOptions} allowFiltering={true} height={273} allowPaging={true} pageSettings={pageOptions} allowSorting={true} actionBegin={actionBegin}>
19+
<ColumnsDirective>
20+
<ColumnDirective field='OrderID' headerText='Order ID' width='100' textAlign="Right" />
21+
<ColumnDirective field='CustomerID' headerText='Customer ID' width='100' />
22+
<ColumnDirective field='Freight' headerText='Freight' width='100' format="C2" />
23+
<ColumnDirective field='OrderDate' headerText='Order Date' width='100' format='yMd' />
24+
</ColumnsDirective>
25+
<Inject services={[Filter, Page, Sort]} />
26+
</GridComponent>
27+
};
28+
export default App;

‎ej2-react/code-snippet/grid/excel-like-filter-cs6/app/App.tsx

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { ColumnDirective, ColumnsDirective, ActionArgs, CheckBoxFilterBase, ExcelFilterBase } from '@syncfusion/ej2-react-grids';
2+
import { Filter, Page, Sort, GridComponent, Inject } from '@syncfusion/ej2-react-grids';
3+
import { DataManager, WebApiAdaptor } from '@syncfusion/ej2-data';
4+
import * as React from 'react';
5+
import { orderData } from './datasource';
6+
function App() {
7+
const FilterOptions = {
8+
type: 'Excel'
9+
};
10+
const pageOptions = { pageSize: 12 }
11+
const actionBegin = (args: ActionArgs) => {
12+
const hostUrl = 'https://services.syncfusion.com/react/production/';
13+
if (args.requestType === "filterBeforeOpen") {
14+
// Assign custom remote data source to the filter module data source
15+
(args['filterModel'] as CheckBoxFilterBase | ExcelFilterBase).options.dataSource = new DataManager({ url: hostUrl + 'api/Orders', adaptor: new WebApiAdaptor });
16+
}
17+
}
18+
return <GridComponent dataSource={orderData} filterSettings={FilterOptions} allowFiltering={true} height={273} allowPaging={true} pageSettings={pageOptions} allowSorting={true} actionBegin={actionBegin}>
19+
<ColumnsDirective>
20+
<ColumnDirective field='OrderID' headerText='Order ID' width='100' textAlign="Right" />
21+
<ColumnDirective field='CustomerID' headerText='Customer ID' width='100' />
22+
<ColumnDirective field='Freight' headerText='Freight' width='100' format="C2" />
23+
<ColumnDirective field='OrderDate' headerText='Order Date' width='100' format='yMd' />
24+
</ColumnsDirective>
25+
<Inject services={[Filter, Page, Sort]} />
26+
</GridComponent>
27+
};
28+
export default App;

0 commit comments

Comments
 (0)