Skip to content

Commit 99db0f5

Browse files
authored
feat(Chart): support custom data source label formmater parameter (#574)
* chore: 依赖 utility 脚本 * refactor: 增加 formatter 自定义方法 * chore: bump version 9.0.1
1 parent 073d801 commit 99db0f5

2 files changed

Lines changed: 3 additions & 22 deletions

File tree

src/components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.0.0</Version>
4+
<Version>9.0.1</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>

src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
import '../../js/chart.umd.js'
22
import '../../js/chartjs-plugin-datalabels.js'
3+
import { deepMerge } from '../../../BootstrapBlazor/modules/utility.js'
34
import Data from '../../../BootstrapBlazor/modules/data.js'
45
import EventHandler from "../../../BootstrapBlazor/modules/event-handler.js"
56

67
Chart.register(ChartDataLabels);
78

8-
// WIP: wait net9 release
9-
// later will move into bootstrapblazor for global init make sure window.BootstrapBlazor is defined
10-
if (window.BootstrapBlazor === void 0) {
11-
window.BootstrapBlazor = {};
12-
}
13-
149
if (window.BootstrapBlazor.Chart === void 0) {
1510
const elementMap = new Map();
1611
window.BootstrapBlazor.Chart = new class {
@@ -99,20 +94,6 @@ const genericOptions = {
9994
radius: 0
10095
}
10196

102-
const deepMerge = (obj1, obj2) => {
103-
for (let key in obj2) {
104-
if (obj2.hasOwnProperty(key)) {
105-
if (obj2[key] instanceof Object && obj1[key] instanceof Object) {
106-
obj1[key] = deepMerge(obj1[key], obj2[key]);
107-
}
108-
else {
109-
obj1[key] = obj2[key];
110-
}
111-
}
112-
}
113-
return obj1;
114-
}
115-
11697
const getChartOption = function (option) {
11798
const appendData = option.appendData;
11899
delete option.appendData;
@@ -388,7 +369,7 @@ const getChartOption = function (option) {
388369
datalabels: {
389370
anchor: option.options.anchor,
390371
align: option.options.align,
391-
formatter: Math.round,
372+
formatter: option.options.formatter,
392373
display: option.options.showDataLabel,
393374
color: option.options.chartDataLabelColor,
394375
font: {

0 commit comments

Comments
 (0)