From e7dbd8b552df82545132b27c94d1c1914c1be23b Mon Sep 17 00:00:00 2001 From: SundaresanGunasekaran Date: Tue, 19 Nov 2024 17:55:48 +0530 Subject: [PATCH 1/3] feature(REPORT-396350): Grid Improvements (14/11/2024) --- build/templates/common/index.css | 9 ++++++++- build/templates/common/index.html | 14 +++++++------- build/templates/common/index.js | 7 +++---- build/templates/report-designer/index.html | 14 +++++++------- build/templates/report-designer/index.js | 11 ++++++++++- build/templates/report-designer/rdlc/index.html | 16 ++++++++-------- build/templates/report-designer/rdlc/index.js | 2 +- package.json | 6 +++--- src/controls/samples.json | 1 - 9 files changed, 47 insertions(+), 33 deletions(-) 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..f93e9e3 100644 --- a/build/templates/common/index.html +++ b/build/templates/common/index.html @@ -1,5 +1,5 @@ - + {{title}} @@ -58,18 +58,18 @@
- -
Bold Reports for JavaScript
+ +

Bold Reports for JavaScript
+ title="Report Server" target="_blank" rel="noreferrer">Schedule Free Demo --> Product Detail - Try it Free + title="Report Viewer" target="_blank" rel="noreferrer">Product Detail + Try it Free
diff --git a/build/templates/common/index.js b/build/templates/common/index.js index d8017b0..62f7b92 100644 --- a/build/templates/common/index.js +++ b/build/templates/common/index.js @@ -45,9 +45,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', () => { @@ -61,4 +60,4 @@ window.addEventListener('beforeunload', () => { function destroyReportControls() { const reportViewerElement = document.querySelector('.e-reportviewer.e-js'); if (reportViewerElement) { $(reportViewerElement).data('boldReportViewer')._ajaxCallMethod("ClearCache", "_clearCurrentServerCache", false); } -} +} \ No newline at end of file diff --git a/build/templates/report-designer/index.html b/build/templates/report-designer/index.html index 7742993..2d793c6 100644 --- a/build/templates/report-designer/index.html +++ b/build/templates/report-designer/index.html @@ -1,5 +1,5 @@ - + RDL Sample | JavaScript Report Designer | Bold Reports @@ -39,18 +39,18 @@
- -
Bold Reports for JavaScript
+ +

Bold Reports for JavaScript
+ title="Report Server" target="_blank" rel="noreferrer">Schedule Free Demo --> Product Detail - Try it Free + title="Report Designer" target="_blank" rel="noreferrer">Product Detail + Try it Free
diff --git a/build/templates/report-designer/index.js b/build/templates/report-designer/index.js index 00fc5ea..dd154b7 100644 --- a/build/templates/report-designer/index.js +++ b/build/templates/report-designer/index.js @@ -41,7 +41,7 @@ $(function () { } }], 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 +74,15 @@ function controlCreate() { } }); } + if (reportName == "powerpoint-report.rdl") { + designerInst.setModel({ + previewOptions: { + exportSettings: { + exportOptions: ej.ReportViewer.ExportOptions.PPT + } + } + }); + } } function onAjaxBeforeLoad(args) { diff --git a/build/templates/report-designer/rdlc/index.html b/build/templates/report-designer/rdlc/index.html index ef400de..a38b66f 100644 --- a/build/templates/report-designer/rdlc/index.html +++ b/build/templates/report-designer/rdlc/index.html @@ -1,5 +1,5 @@ - + RDLC Sample | JavaScript Report Designer | Bold Reports @@ -39,18 +39,18 @@
- -
Bold Reports for JavaScript
+ +

Bold Reports for JavaScript
+ title="Report Server" target="_blank" rel="noreferrer">Schedule Free Demo --> Product Detail - Try it Free + title="Report Designer" target="_blank" rel="noreferrer">Product Detail + Try it Free
@@ -67,4 +67,4 @@ }); - \ No newline at end of file + diff --git a/build/templates/report-designer/rdlc/index.js b/build/templates/report-designer/rdlc/index.js index 9acb84f..74e4ffd 100644 --- a/build/templates/report-designer/rdlc/index.js +++ b/build/templates/report-designer/rdlc/index.js @@ -41,7 +41,7 @@ $(function () { } }], 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, diff --git a/package.json b/package.json index 75d2abe..5306a06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "javascript-samples", - "version": "6.2.32", + "version": "6.3.16", "description": "", "author": "", "license": "ISC", @@ -41,8 +41,8 @@ }, "dependencies": { "@babel/polyfill": "7.2.5", - "@boldreports/javascript-reporting-controls": "6.1.34", - "@boldreports/javascript-reporting-extensions": "6.1.34", + "@boldreports/javascript-reporting-controls": "6.3.16", + "@boldreports/javascript-reporting-extensions": "6.3.16", "codemirror": "5.58.2", "hasher": "1.2.0", "jquery": "3.6.0", diff --git a/src/controls/samples.json b/src/controls/samples.json index 5c7e234..272b814 100644 --- a/src/controls/samples.json +++ b/src/controls/samples.json @@ -409,7 +409,6 @@ "routerPath": "powerpoint-report", "sampleName": "PowerPoint Report", "basePath": "report-viewer", - "status": "Updated", "directoryName": "powerpoint-report", "imageDetails": { "isLandscape": true, From b99502bdb826a2c3ab95dd806c9a437acb6ed99c Mon Sep 17 00:00:00 2001 From: SundaresanGunasekaran Date: Tue, 19 Nov 2024 18:18:10 +0530 Subject: [PATCH 2/3] feature(REPORT-399152): Bold Reports 6.3 Release Changes --- build/templates/common/index.css | 1 - 1 file changed, 1 deletion(-) diff --git a/build/templates/common/index.css b/build/templates/common/index.css index f502dc3..72973a6 100644 --- a/build/templates/common/index.css +++ b/build/templates/common/index.css @@ -319,7 +319,6 @@ body { display: flex; position: fixed; z-index: 1; - font-family: "Roboto", "Segoe UI", "GeezaPro", "DejaVu Serif", "sans-serif"; justify-content: space-between; } From 10b3c2557873c8ead9d70377f5f548ede8b2c0c4 Mon Sep 17 00:00:00 2001 From: SundaresanGunasekaran Date: Wed, 20 Nov 2024 00:25:28 +0530 Subject: [PATCH 3/3] feature(REPORT-399152): Bold Reports 6.3 Release Changes --- build/templates/common/index.css | 8 +------- build/templates/common/index.html | 14 +++++++------- build/templates/common/index.js | 7 ++++--- build/templates/report-designer/index.html | 14 +++++++------- build/templates/report-designer/index.js | 11 +---------- build/templates/report-designer/rdlc/index.html | 16 ++++++++-------- build/templates/report-designer/rdlc/index.js | 2 +- 7 files changed, 29 insertions(+), 43 deletions(-) diff --git a/build/templates/common/index.css b/build/templates/common/index.css index 72973a6..39ca597 100644 --- a/build/templates/common/index.css +++ b/build/templates/common/index.css @@ -172,13 +172,8 @@ body { } #r-w-container #r-w-property-container { - height: auto; + height: 100%; width: 30%; - position: relative; -} - -#r-w-property-container .e-spinner-pane { - background-color: rgba(0, 0, 0, 0.4); } #r-w-property-name-category { @@ -228,7 +223,6 @@ body { #r-w-property-enddate { display: inline-flex; margin-left: 20px; - margin-right: 20px; } #r-w-property-name-category, diff --git a/build/templates/common/index.html b/build/templates/common/index.html index f93e9e3..eae1601 100644 --- a/build/templates/common/index.html +++ b/build/templates/common/index.html @@ -1,5 +1,5 @@ - + {{title}} @@ -58,18 +58,18 @@
- -

Bold Reports for JavaScript

+ +
Bold Reports for JavaScript
+ title="Report Server" target="_blank">Schedule Free Demo --> Product Detail - Try it Free + title="Report Viewer" target="_blank">Product Detail + Try it Free
diff --git a/build/templates/common/index.js b/build/templates/common/index.js index 62f7b92..d8017b0 100644 --- a/build/templates/common/index.js +++ b/build/templates/common/index.js @@ -45,8 +45,9 @@ import './../../../node_modules/codemirror/addon/hint/show-hint.css'; import * as CodeMirror from 'codemirror'; window['CodeMirror'] = CodeMirror; -$(function() { - document.getElementById('home_page').setAttribute('href', '/javascript/#/'); +$(function () { + let url = location.origin.indexOf('demos.boldreports.com') !== -1 ? '/' : '/demos/'; + document.getElementById('home_page').setAttribute('href', url + 'javascript/#/'); }); window.addEventListener('beforeunload', () => { @@ -60,4 +61,4 @@ window.addEventListener('beforeunload', () => { function destroyReportControls() { const reportViewerElement = document.querySelector('.e-reportviewer.e-js'); if (reportViewerElement) { $(reportViewerElement).data('boldReportViewer')._ajaxCallMethod("ClearCache", "_clearCurrentServerCache", false); } -} \ No newline at end of file +} diff --git a/build/templates/report-designer/index.html b/build/templates/report-designer/index.html index 2d793c6..7742993 100644 --- a/build/templates/report-designer/index.html +++ b/build/templates/report-designer/index.html @@ -1,5 +1,5 @@ - + RDL Sample | JavaScript Report Designer | Bold Reports @@ -39,18 +39,18 @@
- -

Bold Reports for JavaScript

+ +
Bold Reports for JavaScript
+ title="Report Server" target="_blank">Schedule Free Demo --> Product Detail - Try it Free + title="Report Designer" target="_blank">Product Detail + Try it Free
diff --git a/build/templates/report-designer/index.js b/build/templates/report-designer/index.js index dd154b7..00fc5ea 100644 --- a/build/templates/report-designer/index.js +++ b/build/templates/report-designer/index.js @@ -41,7 +41,7 @@ $(function () { } }], toolbarSettings: { - items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open + items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open }, ajaxBeforeLoad: onAjaxBeforeLoad, toolbarRendering: window.Globals.DESIGNER_TOOLBAR_RENDERING, @@ -74,15 +74,6 @@ function controlCreate() { } }); } - if (reportName == "powerpoint-report.rdl") { - designerInst.setModel({ - previewOptions: { - exportSettings: { - exportOptions: ej.ReportViewer.ExportOptions.PPT - } - } - }); - } } function onAjaxBeforeLoad(args) { diff --git a/build/templates/report-designer/rdlc/index.html b/build/templates/report-designer/rdlc/index.html index a38b66f..ef400de 100644 --- a/build/templates/report-designer/rdlc/index.html +++ b/build/templates/report-designer/rdlc/index.html @@ -1,5 +1,5 @@ - + RDLC Sample | JavaScript Report Designer | Bold Reports @@ -39,18 +39,18 @@
- -

Bold Reports for JavaScript

+ +
Bold Reports for JavaScript
+ title="Report Server" target="_blank">Schedule Free Demo --> Product Detail - Try it Free + title="Report Designer" target="_blank">Product Detail + Try it Free
@@ -67,4 +67,4 @@

Bold Reports for JavaScript

}); - + \ No newline at end of file diff --git a/build/templates/report-designer/rdlc/index.js b/build/templates/report-designer/rdlc/index.js index 74e4ffd..9acb84f 100644 --- a/build/templates/report-designer/rdlc/index.js +++ b/build/templates/report-designer/rdlc/index.js @@ -41,7 +41,7 @@ $(function () { } }], toolbarSettings: { - items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open + items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open }, ajaxBeforeLoad: onAjaxBeforeLoad, reportOpened: onReportOpened,