From 3301de67c4800cb947271b31d017ead1b521cbe2 Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 26 Mar 2025 02:10:15 +0530 Subject: [PATCH 1/3] fix: based on number of labels change space in charts --- frappe/public/js/frappe/utils/utils.js | 8 ++++++-- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index ae4f223c19..3730fe8080 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1237,7 +1237,7 @@ Object.assign(frappe.utils, { chart_args[key] = custom_options[key]; } } - + frappe.utils.set_space_label_ratio(chart_args); return new frappe.Chart(wrapper, chart_args); }, @@ -1245,7 +1245,11 @@ Object.assign(frappe.utils, { const default_country = frappe.sys_defaults.country; return frappe.utils.shorten_number(label, country || default_country, 3); }, - + set_space_label_ratio(chart_args) { + if (chart_args.data.labels.length > 10) { + chart_args["axisOptions"]["seriesLabelSpaceRatio"] = 0.9; + } + }, generate_route(item) { const type = item.type.toLowerCase(); if (type === "doctype") { diff --git a/package.json b/package.json index 7682d8adce..7bc7662037 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "esbuild-plugin-vue3": "^0.3.0", "fast-deep-equal": "^2.0.1", "fast-glob": "^3.2.5", - "frappe-charts": "2.0.0-rc22", + "frappe-charts": "2.0.0-rc24", "frappe-datatable": "1.18.1", "frappe-gantt": "^0.6.0", "highlight.js": "^10.4.1", diff --git a/yarn.lock b/yarn.lock index 93ecd1922d..d7ee4dcc1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,10 +1485,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-rc22: - version "2.0.0-rc22" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc22.tgz#9a5a747febdc381a1d4d7af96e89cf519dfba8c0" - integrity sha512-N7f/8979wJCKjusOinaUYfMxB80YnfuVLrSkjpj4LtyqS0BGS6SuJxUnb7Jl4RWUFEIs7zEhideIKnyLeFZF4Q== +frappe-charts@2.0.0-rc24: + version "2.0.0-rc24" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc24.tgz#cdb5eaed91ff3c88f76afbd18b7c4f1eabf7bdc7" + integrity sha512-RYgLWDSah3Kjsl70cZwt5xaqcaktTE+VcAfSWmfOGWaIpltFaQTsadh4G7tAhMZirEjlT5iEQ3ikz680/+1vOw== frappe-datatable@1.18.1: version "1.18.1" From 4f705afb51f30e0fbebce297f8b7f14c7563a696 Mon Sep 17 00:00:00 2001 From: sokumon Date: Wed, 26 Mar 2025 15:27:23 +0530 Subject: [PATCH 2/3] chore: update frappe-charts --- frappe/public/scss/desk.bundle.scss | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/scss/desk.bundle.scss b/frappe/public/scss/desk.bundle.scss index cbf365861a..eb1fd65766 100644 --- a/frappe/public/scss/desk.bundle.scss +++ b/frappe/public/scss/desk.bundle.scss @@ -1,7 +1,7 @@ @import "frappe/public/css/fonts/fontawesome/font-awesome.min.css"; @import "frappe/public/css/octicons/octicons.css"; @import "frappe/public/css/fonts/inter/inter.scss"; -@import "~frappe-charts/dist/frappe-charts.min"; +@import "~frappe-charts/dist/assets/output-d7b7460b.css"; @import "~plyr/dist/plyr"; @import "./desk/index"; diff --git a/package.json b/package.json index 7bc7662037..d8f40dbcfc 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "esbuild-plugin-vue3": "^0.3.0", "fast-deep-equal": "^2.0.1", "fast-glob": "^3.2.5", - "frappe-charts": "2.0.0-rc24", + "frappe-charts": "2.0.0-rc25", "frappe-datatable": "1.18.1", "frappe-gantt": "^0.6.0", "highlight.js": "^10.4.1", diff --git a/yarn.lock b/yarn.lock index d7ee4dcc1a..001d115a06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,10 +1485,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-rc24: - version "2.0.0-rc24" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc24.tgz#cdb5eaed91ff3c88f76afbd18b7c4f1eabf7bdc7" - integrity sha512-RYgLWDSah3Kjsl70cZwt5xaqcaktTE+VcAfSWmfOGWaIpltFaQTsadh4G7tAhMZirEjlT5iEQ3ikz680/+1vOw== +frappe-charts@2.0.0-rc25: + version "2.0.0-rc25" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc25.tgz#0af540df67d07cef244e18ddad1637df09227c8b" + integrity sha512-3sghNGh6DQ5VaEuNtY7tyrvK7erIEBPYmyxhUPkqbkiEIIAA9HJczF90c4wr4hREfsWaTAntkaQ/Fpi2reS+Hg== frappe-datatable@1.18.1: version "1.18.1" From d6470dc9bd784877aae895bc8713fa790d01f10d Mon Sep 17 00:00:00 2001 From: sokumon Date: Thu, 27 Mar 2025 22:49:53 +0530 Subject: [PATCH 3/3] chore: update frappe-charts to 2.0.0rc26 --- frappe/public/scss/desk.bundle.scss | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/public/scss/desk.bundle.scss b/frappe/public/scss/desk.bundle.scss index eb1fd65766..cbf365861a 100644 --- a/frappe/public/scss/desk.bundle.scss +++ b/frappe/public/scss/desk.bundle.scss @@ -1,7 +1,7 @@ @import "frappe/public/css/fonts/fontawesome/font-awesome.min.css"; @import "frappe/public/css/octicons/octicons.css"; @import "frappe/public/css/fonts/inter/inter.scss"; -@import "~frappe-charts/dist/assets/output-d7b7460b.css"; +@import "~frappe-charts/dist/frappe-charts.min"; @import "~plyr/dist/plyr"; @import "./desk/index"; diff --git a/package.json b/package.json index d8f40dbcfc..6ae5fc10fc 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "esbuild-plugin-vue3": "^0.3.0", "fast-deep-equal": "^2.0.1", "fast-glob": "^3.2.5", - "frappe-charts": "2.0.0-rc25", + "frappe-charts": "^2.0.0-rc26", "frappe-datatable": "1.18.1", "frappe-gantt": "^0.6.0", "highlight.js": "^10.4.1", diff --git a/yarn.lock b/yarn.lock index 001d115a06..9d06999464 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1485,10 +1485,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-rc25: - version "2.0.0-rc25" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc25.tgz#0af540df67d07cef244e18ddad1637df09227c8b" - integrity sha512-3sghNGh6DQ5VaEuNtY7tyrvK7erIEBPYmyxhUPkqbkiEIIAA9HJczF90c4wr4hREfsWaTAntkaQ/Fpi2reS+Hg== +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-datatable@1.18.1: version "1.18.1"