diff --git a/build/templates/common/index.css b/build/templates/common/index.css
index 39ca597..f502dc3 100644
--- a/build/templates/common/index.css
+++ b/build/templates/common/index.css
@@ -172,8 +172,13 @@ body {
}
#r-w-container #r-w-property-container {
- height: 100%;
+ height: auto;
width: 30%;
+ position: relative;
+}
+
+#r-w-property-container .e-spinner-pane {
+ background-color: rgba(0, 0, 0, 0.4);
}
#r-w-property-name-category {
@@ -223,6 +228,7 @@ body {
#r-w-property-enddate {
display: inline-flex;
margin-left: 20px;
+ margin-right: 20px;
}
#r-w-property-name-category,
@@ -313,6 +319,7 @@ body {
display: flex;
position: fixed;
z-index: 1;
+ font-family: "Roboto", "Segoe UI", "GeezaPro", "DejaVu Serif", "sans-serif";
justify-content: space-between;
}
diff --git a/build/templates/common/index.html b/build/templates/common/index.html
index eae1601..a8224dd 100644
--- a/build/templates/common/index.html
+++ b/build/templates/common/index.html
@@ -59,7 +59,7 @@
diff --git a/build/templates/common/index.js b/build/templates/common/index.js
index d8017b0..937b0a4 100644
--- a/build/templates/common/index.js
+++ b/build/templates/common/index.js
@@ -1,7 +1,7 @@
import * as jquery from 'jquery';
window['$'] = jquery;
-import * as data from './../../../src/controls/samples.json';
-window['reportSamples'] = data.default.samples;
+import samplesData from './../../../src/controls/samples.json';
+window['reportSamples'] = samplesData.samples;
import './../../../src/controls/rdlcData';
//bootstrap
@@ -25,6 +25,16 @@ 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';
+//signature
+import './../extensions/report-item-extensions/signature.reportitem.css';
+import './../extensions/report-item-extensions/signature.dialog.css';
+import { EJSignature } from './../extensions/report-item-extensions/signature.reportitem';
+import { SignatureDialog } from './../extensions/report-item-extensions/signature.dialog';
+
+//shape
+import './../extensions/report-item-extensions/shape.reportitem.css';
+import { EJShape } from './../extensions/report-item-extensions/shape.reportitem';
+
//globals
import './../../../src/controls/globals';
@@ -33,6 +43,14 @@ let qrBarcode = 'EJQRBarcode';
window[barcode] = EJBarcode;
window[qrBarcode] = EJQRBarcode;
+let signature = 'EJSignature';
+let signatureDialog = 'SignatureDialog';
+window[signature] = EJSignature;
+window[signatureDialog] = SignatureDialog;
+
+let shape = 'EJShape';
+window[shape] = EJShape;
+
//code-mirror
import 'codemirror/lib/codemirror';
import 'codemirror/addon/hint/show-hint';
@@ -45,9 +63,8 @@ import './../../../node_modules/codemirror/addon/hint/show-hint.css';
import * as CodeMirror from 'codemirror';
window['CodeMirror'] = CodeMirror;
-$(function () {
- let url = location.origin.indexOf('demos.boldreports.com') !== -1 ? '/' : '/demos/';
- document.getElementById('home_page').setAttribute('href', url + 'javascript/#/');
+$(function() {
+ document.getElementById('home_page').setAttribute('href', '/javascript/#/');
});
window.addEventListener('beforeunload', () => {
diff --git a/build/templates/report-designer/index.html b/build/templates/report-designer/index.html
index 7742993..645c012 100644
--- a/build/templates/report-designer/index.html
+++ b/build/templates/report-designer/index.html
@@ -40,7 +40,7 @@
diff --git a/build/templates/report-designer/index.js b/build/templates/report-designer/index.js
index 00fc5ea..33797ab 100644
--- a/build/templates/report-designer/index.js
+++ b/build/templates/report-designer/index.js
@@ -11,12 +11,13 @@ if (reportName) {
}
$(function () {
+ var url = location.host;
$("#container").boldReportDesigner({
// Specifies the URL of the WebAPI service. It will be used for processing the report.
serviceUrl: window.Globals.DESIGNER_SERVICE_URL,
// This event will be triggered when the Report Designer widget is created
create: controlCreate,
- permissionSettings: { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create},
+ permissionSettings: url.indexOf("demos.boldreports.com") !== -1 ? { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create } : { dataSource: ej.ReportDesigner.Permission.All },
reportItemExtensions: [{
name: 'barcode',
className: 'EJBarcode',
@@ -39,9 +40,31 @@ $(function () {
description: 'Display the barcode lines as report item.',
title: '2D Barcode'
}
+ }, {
+ name: 'ESignature',
+ className: 'EJSignature',
+ imageClass: 'customitem-signature',
+ displayName: 'Electronic',
+ category: 'Signature',
+ toolTip:{
+ requirements: 'Add a report item to the designer area.',
+ description: 'This report item is used to add a graphic signature.',
+ title: 'Signature'
+ }
+ }, {
+ name: 'Shape',
+ className: 'EJShape',
+ imageClass: 'customitem-shape',
+ displayName: 'Shape',
+ category: 'Shapes',
+ toolTip: {
+ requirements: 'Add a report item to the designer area',
+ description: 'Display the different types of shapes as report item',
+ title: 'Shapes'
+ }
}],
toolbarSettings: {
- items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
+ items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
},
ajaxBeforeLoad: onAjaxBeforeLoad,
toolbarRendering: window.Globals.DESIGNER_TOOLBAR_RENDERING,
@@ -74,6 +97,15 @@ function controlCreate() {
}
});
}
+ if (reportName == "powerpoint-report.rdl") {
+ designerInst.setModel({
+ previewOptions: {
+ exportSettings: {
+ exportOptions: ej.ReportViewer.ExportOptions.PPT
+ }
+ }
+ });
+ }
}
function onAjaxBeforeLoad(args) {
@@ -93,10 +125,12 @@ function updateDescription() {
metaDes = metaDes.replace(/{{sampleName}}/g, title);
document.getElementsByName('description')[0].content = metaDes;
title += ' | JavaScript Report Designer';
- document.title = title.length < 45 ? title += ' | Bold Reports' : title;
+ const titleWithBoldReports = (title.length < 45) ? title += ' | Bold Reports' : title;
+ document.title = titleWithBoldReports;
+ document.querySelector('meta[property="og:title"]').setAttribute('content', titleWithBoldReports);
}
function getReportName() {
const reportNameRegex = /[\\?&]report-name=([^&#]*)/.exec(location.search);
return reportNameRegex ? reportNameRegex[1] : undefined;
-};
\ No newline at end of file
+};
diff --git a/build/templates/report-designer/rdlc/index.html b/build/templates/report-designer/rdlc/index.html
index ef400de..b4bddd5 100644
--- a/build/templates/report-designer/rdlc/index.html
+++ b/build/templates/report-designer/rdlc/index.html
@@ -40,7 +40,7 @@
diff --git a/build/templates/report-designer/rdlc/index.js b/build/templates/report-designer/rdlc/index.js
index 9acb84f..a7960a1 100644
--- a/build/templates/report-designer/rdlc/index.js
+++ b/build/templates/report-designer/rdlc/index.js
@@ -11,12 +11,13 @@ if (reportName) {
}
$(function () {
+ var url = location.host;
$("#container").boldReportDesigner({
// Specifies the URL of the WebAPI service. It will be used for processing the report.
serviceUrl: window.Globals.DESIGNER_SERVICE_URL,
// This event will be triggered when the Report Designer widget is created
create: controlCreate,
- permissionSettings: { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create},
+ permissionSettings: url.indexOf("demos.boldreports.com") !== -1 ? { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create } : { dataSource: ej.ReportDesigner.Permission.All },
reportItemExtensions: [{
name: 'barcode',
className: 'EJBarcode',
@@ -39,9 +40,31 @@ $(function () {
description: 'Display the barcode lines as report item.',
title: '2D Barcode'
}
+ }, {
+ name: 'ESignature',
+ className: 'EJSignature',
+ imageClass: 'customitem-signature',
+ displayName: 'Electronic',
+ category: 'Signature',
+ toolTip:{
+ requirements: 'Add a report item to the designer area.',
+ description: 'This report item is used to add a graphic signature.',
+ title: 'Signature'
+ }
+ }, {
+ name: 'Shape',
+ className: 'EJShape',
+ imageClass: 'customitem-shape',
+ displayName: 'Shape',
+ category: 'Shapes',
+ toolTip: {
+ requirements: 'Add a report item to the designer area',
+ description: 'Display the different types of shapes as report item',
+ title: 'Shapes'
+ }
}],
toolbarSettings: {
- items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
+ items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
},
ajaxBeforeLoad: onAjaxBeforeLoad,
reportOpened: onReportOpened,
@@ -102,10 +125,12 @@ function updateDescription() {
metaDes = metaDes.replace(/{{sampleName}}/g, title);
document.getElementsByName('description')[0].content = metaDes;
title += ' | JavaScript Report Designer';
- document.title = title.length < 45 ? title += ' | Bold Reports' : title;
+ const titleWithBoldReports = (title.length < 45) ? title += ' | Bold Reports' : title;
+ document.title = titleWithBoldReports;
+ document.querySelector('meta[property="og:title"]').setAttribute('content', titleWithBoldReports);
}
function getReportName() {
const reportNameRegex = /[\\?&]report-name=([^&#]*)/.exec(location.search);
return reportNameRegex ? reportNameRegex[1] : undefined;
-};
\ No newline at end of file
+};
diff --git a/package.json b/package.json
index 357c448..09bc704 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "javascript-samples",
- "version": "7.1.9",
+ "version": "9.1.7",
"description": "",
"author": "",
"license": "ISC",
@@ -39,8 +39,8 @@
},
"dependencies": {
"@babel/polyfill": "7.2.5",
- "@boldreports/javascript-reporting-controls": "7.1.9",
- "@boldreports/javascript-reporting-extensions": "7.1.9",
+ "@boldreports/javascript-reporting-controls": "9.1.7",
+ "@boldreports/javascript-reporting-extensions": "9.1.7",
"codemirror": "5.58.2",
"hasher": "1.2.0",
"jquery": "3.6.0",
diff --git a/src/common/header/header.html b/src/common/header/header.html
index 66af639..1f8e41c 100644
--- a/src/common/header/header.html
+++ b/src/common/header/header.html
@@ -1,7 +1,7 @@