fix: based on number of labels change space in charts
This commit is contained in:
parent
7aaccf1112
commit
3301de67c4
3 changed files with 11 additions and 7 deletions
|
|
@ -1237,7 +1237,7 @@ Object.assign(frappe.utils, {
|
||||||
chart_args[key] = custom_options[key];
|
chart_args[key] = custom_options[key];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
frappe.utils.set_space_label_ratio(chart_args);
|
||||||
return new frappe.Chart(wrapper, chart_args);
|
return new frappe.Chart(wrapper, chart_args);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -1245,7 +1245,11 @@ Object.assign(frappe.utils, {
|
||||||
const default_country = frappe.sys_defaults.country;
|
const default_country = frappe.sys_defaults.country;
|
||||||
return frappe.utils.shorten_number(label, country || default_country, 3);
|
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) {
|
generate_route(item) {
|
||||||
const type = item.type.toLowerCase();
|
const type = item.type.toLowerCase();
|
||||||
if (type === "doctype") {
|
if (type === "doctype") {
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@
|
||||||
"esbuild-plugin-vue3": "^0.3.0",
|
"esbuild-plugin-vue3": "^0.3.0",
|
||||||
"fast-deep-equal": "^2.0.1",
|
"fast-deep-equal": "^2.0.1",
|
||||||
"fast-glob": "^3.2.5",
|
"fast-glob": "^3.2.5",
|
||||||
"frappe-charts": "2.0.0-rc22",
|
"frappe-charts": "2.0.0-rc24",
|
||||||
"frappe-datatable": "1.18.1",
|
"frappe-datatable": "1.18.1",
|
||||||
"frappe-gantt": "^0.6.0",
|
"frappe-gantt": "^0.6.0",
|
||||||
"highlight.js": "^10.4.1",
|
"highlight.js": "^10.4.1",
|
||||||
|
|
|
||||||
|
|
@ -1485,10 +1485,10 @@ fraction.js@^4.3.6:
|
||||||
resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
|
resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
|
||||||
integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
|
integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
|
||||||
|
|
||||||
frappe-charts@2.0.0-rc22:
|
frappe-charts@2.0.0-rc24:
|
||||||
version "2.0.0-rc22"
|
version "2.0.0-rc24"
|
||||||
resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc22.tgz#9a5a747febdc381a1d4d7af96e89cf519dfba8c0"
|
resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc24.tgz#cdb5eaed91ff3c88f76afbd18b7c4f1eabf7bdc7"
|
||||||
integrity sha512-N7f/8979wJCKjusOinaUYfMxB80YnfuVLrSkjpj4LtyqS0BGS6SuJxUnb7Jl4RWUFEIs7zEhideIKnyLeFZF4Q==
|
integrity sha512-RYgLWDSah3Kjsl70cZwt5xaqcaktTE+VcAfSWmfOGWaIpltFaQTsadh4G7tAhMZirEjlT5iEQ3ikz680/+1vOw==
|
||||||
|
|
||||||
frappe-datatable@1.18.1:
|
frappe-datatable@1.18.1:
|
||||||
version "1.18.1"
|
version "1.18.1"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue