Merge pull request #42 from SundaresanGunasekaran/master

feature(REPORT-441126): Bold Reports 10.1 Release Changes

Author: karthickthangasamy

build/copy.js

@@ -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/';
@@ -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();
 });
 
@@ -40,7 +49,10 @@ gulp.task('update-extensions-export', (done) => {
         'barcode': ['barcode.reportitem.js', '1D'],
         'qrbarcode': ['qrbarcode.reportitem.js', '2D'],
         'signature': ['signature.reportitem.js', 'signature'],
-        'signatureDialog': ['signature.dialog.js', 'signatureDialog']
+        'signatureDialog': ['signature.dialog.js', 'signatureDialog'],
+        'shape': ['shape.reportitem.js', 'shape'],
+        'pdfDocument': ['pdfdocument.reportitem.js', 'pdfDocument'],
+        'htmlDocument': ['htmldocument.reportitem.js', 'htmlDocument']
     };
     const updateFile = (key, [filename, exportKey]) => {
         const filePath = `${extensionsItemDir}${filename}`;

build/templates/common/index.js

@@ -25,6 +25,11 @@ import './../extensions/report-item-extensions/barcode.reportitem.css';
 import { EJBarcode } from './../extensions/report-item-extensions/barcode.reportitem';
 import { EJQRBarcode } from './../extensions/report-item-extensions/qrbarcode.reportitem';
 
+//Document
+import './../extensions/report-item-extensions/document.reportitem.css';
+import { EJPdfDocument } from './../extensions/report-item-extensions/pdfdocument.reportitem';
+import { EJHtmlDocument } from './../extensions/report-item-extensions/htmldocument.reportitem';
+
 //signature
 import './../extensions/report-item-extensions/signature.reportitem.css';
 import './../extensions/report-item-extensions/signature.dialog.css';
@@ -51,6 +56,11 @@ window[signatureDialog] = SignatureDialog;
 let shape = 'EJShape';
 window[shape] = EJShape;
 
+let pdfDocument = 'EJPdfDocument';
+let htmlDocument = 'EJHtmlDocument';
+window[pdfDocument] = EJPdfDocument;
+window[htmlDocument] = EJHtmlDocument;
+
 //code-mirror
 import 'codemirror/lib/codemirror';
 import 'codemirror/addon/hint/show-hint';

build/templates/report-designer/index.js

@@ -62,6 +62,29 @@ $(function () {
                 description: 'Display the different types of shapes as report item',
                 title: 'Shapes'
             }
+        }, {
+            name: 'pdfdocument',
+            className: 'EJPdfDocument',
+            imageClass: 'customitem-pdfdocument',
+            displayName: 'PDF',
+            category: 'Documents',
+            toolTip: {
+                requirements: 'Add a report item to the designer area.',
+                description: 'Display the pdf document content in the report',
+                title: 'PDF'
+            },
+            allowHeaderFooter: false
+        }, {
+            name: 'htmldocument',
+            className: 'EJHtmlDocument',
+            imageClass: 'customitem-htmldocument',
+            displayName: 'Html',
+            category: 'Documents',
+            toolTip: {
+                requirements: 'Add a report item to the designer area.',
+                description: 'This report item used to process the html markup text and url',
+                title: 'Html'
+            },
         }],
         toolbarSettings: {
             items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open

build/templates/report-designer/rdlc/index.js

@@ -62,6 +62,29 @@ $(function () {
                 description: 'Display the different types of shapes as report item',
                 title: 'Shapes'
             }
+        }, {
+            name: 'pdfdocument',
+            className: 'EJPdfDocument',
+            imageClass: 'customitem-pdfdocument',
+            displayName: 'PDF',
+            category: 'Documents',
+            toolTip: {
+                requirements: 'Add a report item to the designer area.',
+                description: 'Display the pdf document content in the report',
+                title: 'PDF'
+            },
+            allowHeaderFooter: false
+        }, {
+            name: 'htmldocument',
+            className: 'EJHtmlDocument',
+            imageClass: 'customitem-htmldocument',
+            displayName: 'Html',
+            category: 'Documents',
+            toolTip: {
+                requirements: 'Add a report item to the designer area.',
+                description: 'This report item used to process the html markup text and url',
+                title: 'Html'
+            },
         }],
         toolbarSettings: {
             items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open

package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-samples",
-  "version": "9.1.7",
+  "version": "10.1.11",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -39,14 +39,14 @@
   },
   "dependencies": {
     "@babel/polyfill": "7.2.5",
-    "@boldreports/javascript-reporting-controls": "9.1.7",
-    "@boldreports/javascript-reporting-extensions": "9.1.7",
+    "@boldreports/javascript-reporting-controls": "10.1.11",
+    "@boldreports/javascript-reporting-extensions": "10.1.11",
     "codemirror": "5.58.2",
     "hasher": "1.2.0",
     "jquery": "3.6.0",
     "jquery-validation": "1.19.5",
     "jsrender": "1.0.2",
-    "prismjs": "1.27.0",
+    "prismjs": "1.30.0",
     "whatwg-fetch": "3.0.0",
     "html-to-text": "^8.2.0",
     "markdown-spellcheck": "^1.3.1"