Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.0.0</Version>
<Version>9.0.1</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import '../../js/chart.umd.js'
import '../../js/chartjs-plugin-datalabels.js'
import { deepMerge } from '../../../BootstrapBlazor/modules/utility.js'
import Data from '../../../BootstrapBlazor/modules/data.js'
import EventHandler from "../../../BootstrapBlazor/modules/event-handler.js"

Chart.register(ChartDataLabels);

// WIP: wait net9 release
// later will move into bootstrapblazor for global init make sure window.BootstrapBlazor is defined
if (window.BootstrapBlazor === void 0) {
window.BootstrapBlazor = {};
}

if (window.BootstrapBlazor.Chart === void 0) {
const elementMap = new Map();
window.BootstrapBlazor.Chart = new class {
Expand Down Expand Up @@ -99,20 +94,6 @@ const genericOptions = {
radius: 0
}

const deepMerge = (obj1, obj2) => {
for (let key in obj2) {
if (obj2.hasOwnProperty(key)) {
if (obj2[key] instanceof Object && obj1[key] instanceof Object) {
obj1[key] = deepMerge(obj1[key], obj2[key]);
}
else {
obj1[key] = obj2[key];
}
}
}
return obj1;
}

const getChartOption = function (option) {
const appendData = option.appendData;
delete option.appendData;
Expand Down Expand Up @@ -388,7 +369,7 @@ const getChartOption = function (option) {
datalabels: {
anchor: option.options.anchor,
align: option.options.align,
formatter: Math.round,
formatter: option.options.formatter,
Copy link

Copilot AI Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatter property is being assigned directly from option.options.formatter without any validation or fallback. If option.options.formatter is undefined or null, this could cause chart rendering issues. Consider providing a default formatter like option.options.formatter || Math.round to maintain backward compatibility.

Suggested change
formatter: option.options.formatter,
formatter: option.options.formatter || Math.round,

Copilot uses AI. Check for mistakes.
display: option.options.showDataLabel,
color: option.options.chartDataLabelColor,
font: {
Expand Down