diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsScriptContributor.cs similarity index 84% rename from samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsScriptContributor.cs index eaacdc0e7a..6c55d787ee 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsScriptContributor.cs @@ -1,6 +1,6 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; -namespace DashboardDemo.Web.Bundles +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs { public class ChartjsScriptContributor : BundleContributor { diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsStyleContributor.cs similarity index 84% rename from samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsStyleContributor.cs index 144baaab12..1278023e97 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsStyleContributor.cs @@ -1,6 +1,6 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; -namespace DashboardDemo.Web.Bundles +namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs { public class ChartjsStyleContributor : BundleContributor { diff --git a/npm/packs/chart.js/abp.resourcemapping.js b/npm/packs/chart.js/abp.resourcemapping.js new file mode 100644 index 0000000000..62962983b1 --- /dev/null +++ b/npm/packs/chart.js/abp.resourcemapping.js @@ -0,0 +1,5 @@ +module.exports = { + mappings: { + "@node_modules/chart.js/dist/*.*": "@libs/chart.js/" + } +} \ No newline at end of file diff --git a/npm/packs/chart.js/package.json b/npm/packs/chart.js/package.json new file mode 100644 index 0000000000..ee3ed893d2 --- /dev/null +++ b/npm/packs/chart.js/package.json @@ -0,0 +1,11 @@ +{ + "version": "0.8.0", + "name": "@abp/chart.js", + "publishConfig": { + "access": "public" + }, + "dependencies": { + "chart.js": "^2.8.0" + }, + "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb" +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs index 3e58a16889..2dc1e8f7f3 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs @@ -1,5 +1,5 @@ -using DashboardDemo.Web.Bundles; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.Modularity; namespace DashboardDemo.Web.Pages.Shared.Components.LicenseStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs index 805ca553c7..17d43db339 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs @@ -1,6 +1,6 @@ -using DashboardDemo.Web.Bundles; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; namespace DashboardDemo.Web.Pages.Shared.Components.LicenseStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs index 3207bd055c..8563491cb2 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs @@ -1,5 +1,5 @@ -using DashboardDemo.Web.Bundles; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.Modularity; namespace DashboardDemo.Web.Pages.Shared.Components.NewUserStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs index 1e65fb23ff..5b28e3643f 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs @@ -1,6 +1,6 @@ -using DashboardDemo.Web.Bundles; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; namespace DashboardDemo.Web.Pages.Shared.Components.NewUserStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js b/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js index c041f9c5c7..dbc138aecc 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js +++ b/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js @@ -1,5 +1,4 @@ module.exports = { mappings: { - "@node_modules/chart.js/dist/*.*": "@libs/chart.js/" } }; \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/package.json b/samples/DashboardDemo/src/DashboardDemo.Web/package.json index b678de8d74..64cb356254 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/package.json +++ b/samples/DashboardDemo/src/DashboardDemo.Web/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@abp/aspnetcore.mvc.ui.theme.basic": "^0.6.6", - "chart.js": "^2.8.0" + "@abp/chart.js": "^0.8.0" } } \ No newline at end of file