diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 9174908ffb..0a84efa97a 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -33,6 +33,7 @@ "time_interval", "timeseries", "type", + "show_values_over_chart", "currency", "filters_section", "filters_json", @@ -293,10 +294,17 @@ "fieldtype": "Link", "label": "Currency", "options": "Currency" + }, + { + "default": "0", + "depends_on": "eval: doc.type == \"Bar\" || doc.type == \"Line\"", + "fieldname": "show_values_over_chart", + "fieldtype": "Check", + "label": "Show Values over Chart" } ], "links": [], - "modified": "2025-02-01 21:06:05.808591", + "modified": "2025-06-08 22:49:08.587921", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 7130506ae0..1dbad7dbb0 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -669,7 +669,7 @@ export default class ChartWidget extends Widget { chart_args.data.start = new Date(`${heatmap_year}-01-01`); chart_args.data.end = new Date(`${heatmap_year + 1}-01-01`); } - + if (this.chart_doc.show_values_over_chart) chart_args.valuesOverPoints = true; let set_options = (options) => { let custom_options = JSON.parse(options); for (let key in custom_options) { diff --git a/package.json b/package.json index 27e2716c62..a7fdc106f5 100644 --- a/package.json +++ b/package.json @@ -51,9 +51,10 @@ "esbuild-plugin-vue3": "^0.3.0", "fast-deep-equal": "^2.0.1", "fast-glob": "^3.2.5", - "frappe-charts": "^2.0.0-rc26", + "frappe-charts": "2.0.0-rc27", "frappe-datatable": "1.19.0", "frappe-gantt": "^0.6.0", + "frappe-quill-image-resize": "^3.0.9", "highlight.js": "^10.4.1", "html5-qrcode": "^2.3.8", "jquery": "3.7.0", @@ -70,7 +71,6 @@ "popper.js": "^1.16.0", "postcss": "8", "quill": "2.0.3", - "frappe-quill-image-resize": "^3.0.9", "quill-magic-url": "^3.0.0", "qz-tray": "^2.0.8", "rtlcss": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 798055edf4..ff6a721e28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1426,10 +1426,10 @@ fraction.js@^4.3.6: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== -frappe-charts@^2.0.0-rc26: - version "2.0.0-rc26" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc26.tgz#9632d620b92f2043cebd192a8899119f5715524b" - integrity sha512-0vyXcwcekIeYA6pxCHGcRdG8llC6hpGR91nkbwRGSnBYMKomX2AQtfgTlIKMrE9nmAkewJeZsTx1scni8Ry0iA== +frappe-charts@2.0.0-rc27: + version "2.0.0-rc27" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc27.tgz#a04737d36bcce5381b25ad48896c43b02eb62852" + integrity sha512-J4WCrHYB6oR4Dfu28aaCxlUu64C/V+qJlNE1E0xpya2/yCeqDZ8LA6pS63SBMOdV2CTP8cJ6Isk5m+rZi9gElA== frappe-datatable@1.19.0: version "1.19.0"