From 219b4eff04761f70b5d57d2d636a14d05373e3cd Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 23 Sep 2025 10:23:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=E4=BE=9D=E8=B5=96=20utility=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Chart/Chart.razor.js | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js b/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js index 6f6f6c58..5a0d8cea 100644 --- a/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js +++ b/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js @@ -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 { @@ -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; From 45be0d82f56336f3ac7253072f2e7e5d6c075db1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 23 Sep 2025 10:29:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=20formatter?= =?UTF-8?q?=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapBlazor.Chart/Components/Chart/Chart.razor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js b/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js index 5a0d8cea..5426896f 100644 --- a/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js +++ b/src/components/BootstrapBlazor.Chart/Components/Chart/Chart.razor.js @@ -369,7 +369,7 @@ const getChartOption = function (option) { datalabels: { anchor: option.options.anchor, align: option.options.align, - formatter: Math.round, + formatter: option.options.formatter, display: option.options.showDataLabel, color: option.options.chartDataLabelColor, font: { From 3b3418f78a2de110c5ededf6d702ac8989abfcb1 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Tue, 23 Sep 2025 10:31:12 +0800 Subject: [PATCH 3/3] chore: bump version 9.0.1 --- .../BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj b/src/components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj index 24c1e706..89b95862 100644 --- a/src/components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj +++ b/src/components/BootstrapBlazor.Chart/BootstrapBlazor.Chart.csproj @@ -1,7 +1,7 @@ - 9.0.0 + 9.0.1