Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions build/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ const scripts = {
common: ['common/ej2-base.min.js', 'common/ej2-data.min.js', 'common/ej2-pdf-export.min.js', 'common/ej2-svg-base.min.js'],
control: ['data-visualization/ej2-circulargauge.min.js', 'data-visualization/ej2-lineargauge.min.js', 'data-visualization/ej2-maps.min.js'],
barcode: ['images', 'barcode.reportitem.css', 'barcode.reportitem.js', 'qrbarcode.reportitem.js'],
signature: ['signature.reportitem.css', 'signature.dialog.css', 'signature.reportitem.js', 'signature.dialog.js']
signature: ['signature.reportitem.css', 'signature.dialog.css', 'signature.reportitem.js', 'signature.dialog.js'],
shape: ['shape.reportitem.css','shape.reportitem.js'],
pdf: ['document.reportitem.css', 'pdfdocument.reportitem.js'],
html: ['htmldocument.reportitem.js']
};

const srcDir = 'node_modules/@boldreports/javascript-reporting-controls/Scripts/';
Expand All @@ -17,14 +20,20 @@ const extensionsExportTemp = {
'1D': 'export { EJBarcode };',
'2D': 'export { EJQRBarcode };',
'signature': 'export { EJSignature }',
'signatureDialog': 'export { SignatureDialog }'
'signatureDialog': 'export { SignatureDialog }',
'shape': 'export { EJShape }',
'pdfDocument': 'export { EJPdfDocument };',
'htmlDocument': 'export { EJHtmlDocument };'
}

gulp.task('copy', (done) => {
copyFiles(scripts.common, srcDir, destDir + 'common');
copyFiles(scripts.control, srcDir, destDir + 'data-visualization');
copyFiles(scripts.barcode, extensionsItemSrcDir, extensionsItemDir);
copyFiles(scripts.signature, extensionsItemSrcDir, extensionsItemDir);
copyFiles(scripts.shape, extensionsItemSrcDir, extensionsItemDir);
copyFiles(scripts.html, extensionsItemSrcDir, extensionsItemDir);
copyFiles(scripts.pdf, extensionsItemSrcDir, extensionsItemDir);
done();
});

Expand All @@ -41,6 +50,9 @@ gulp.task('update-extensions-export', (done) => {
'qrbarcode': ['qrbarcode.reportitem.js', '2D'],
'signature': ['signature.reportitem.js', 'signature'],
'signatureDialog': ['signature.dialog.js', 'signatureDialog'],
'pdfDocument': ['pdfdocument.reportitem.js', 'pdfDocument'],
'htmlDocument': ['htmldocument.reportitem.js', 'htmlDocument'],
'shape': ['shape.reportitem.js', 'shape']
};
const updateFile = (key, [filename, exportKey]) => {
const filePath = `${extensionsItemDir}${filename}`;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-samples",
"version": "9.1.7",
"version": "10.1.11",
"scripts": {
"test": "gulp test",
"postinstall": "gulp copy",
Expand Down Expand Up @@ -28,7 +28,7 @@
"core-js": "2.5.4",
"gulp4-run-sequence": "^1.0.1",
"jquery": "3.6.0",
"prismjs": "1.27.0",
"prismjs": "1.30.0",
"rxjs": "6.6.0",
"shelljs": "0.8.5",
"tslib": "2.0.0",
Expand Down
20 changes: 20 additions & 0 deletions src/app/components/designer/designer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { EJQRBarcode } from './../extensions/report-item-extensions/qrbarcode.re
import { EJSignature } from './../extensions/report-item-extensions/signature.reportitem';
import { SignatureDialog } from './../extensions/report-item-extensions/signature.dialog';
import { EJShape } from './../extensions/report-item-extensions/shape.reportitem';
import { EJPdfDocument } from './../extensions/report-item-extensions/pdfdocument.reportitem';
import { EJHtmlDocument } from './../extensions/report-item-extensions/htmldocument.reportitem';

const barcode = 'EJBarcode';
const qrBarcode = 'EJQRBarcode';
Expand All @@ -23,6 +25,11 @@ window[signatureDialog] = SignatureDialog;
const shape = 'EJShape';
window[shape] = EJShape;

const pdfDocument = 'EJPdfDocument';
const htmlDocument = 'EJHtmlDocument';
window[pdfDocument] = EJPdfDocument;
window[htmlDocument] = EJHtmlDocument;

@Component({
selector: 'ej-sample',
templateUrl: './designer.component.html',
Expand Down Expand Up @@ -70,6 +77,19 @@ export class DesignerComponent implements AfterViewInit {
imageClass: 'customitem-shape',
displayName: 'Shape',
category: 'Shapes'
}, {
name: 'pdfdocument',
className: 'EJPdfDocument',
imageClass: 'customitem-pdfdocument',
displayName: 'PDF',
category: 'Documents',
allowHeaderFooter: false
}, {
name: 'htmldocument',
className: 'EJHtmlDocument',
imageClass: 'customitem-htmldocument',
displayName: 'Html',
category: 'Documents',
}];
}

Expand Down
21 changes: 21 additions & 0 deletions src/app/components/rdlc/rdlc.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { EJQRBarcode } from './../extensions/report-item-extensions/qrbarcode.re
import { EJSignature } from './../extensions/report-item-extensions/signature.reportitem';
import { SignatureDialog } from './../extensions/report-item-extensions/signature.dialog';
import { EJShape } from './../extensions/report-item-extensions/shape.reportitem';
import { EJPdfDocument } from './../extensions/report-item-extensions/pdfdocument.reportitem';
import { EJHtmlDocument } from './../extensions/report-item-extensions/htmldocument.reportitem';

import { rdlcData } from '../rdlcData';

Expand All @@ -24,6 +26,12 @@ window[signatureDialog] = SignatureDialog;

const shape = 'EJShape';
window[shape] = EJShape;

const pdfDocument = 'EJPdfDocument';
const htmlDocument = 'EJHtmlDocument';
window[pdfDocument] = EJPdfDocument;
window[htmlDocument] = EJHtmlDocument;

@Component({
selector: 'ej-sample',
templateUrl: './rdlc.component.html',
Expand Down Expand Up @@ -72,6 +80,19 @@ export class RDLCComponent implements AfterViewInit {
imageClass: 'customitem-shape',
displayName: 'Shape',
category: 'Shapes'
},{
name: 'pdfdocument',
className: 'EJPdfDocument',
imageClass: 'customitem-pdfdocument',
displayName: 'PDF',
category: 'Documents',
allowHeaderFooter: false
}, {
name: 'htmldocument',
className: 'EJHtmlDocument',
imageClass: 'customitem-htmldocument',
displayName: 'Html',
category: 'Documents',
}];
}

Expand Down
2 changes: 2 additions & 0 deletions src/app/components/samples.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
"cmr",
"infographics",
"pdf",
"pdfdocument",
"htmldocument",
"shape"
],
"otherPlatforms": {
Expand Down
1 change: 1 addition & 0 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import './app/components/extensions/report-item-extensions/signature.reportitem.css';
@import './app/components/extensions/report-item-extensions/signature.dialog.css';
@import './app/components/extensions/report-item-extensions/shape.reportitem.css';
@import './app/components/extensions/report-item-extensions/document.reportitem.css';

// code-mirror
@import './../node_modules/codemirror/lib/codemirror.css';
Expand Down