tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove DashboardManager

pull/1545/head
Halil İbrahim Kalkan 7 years ago
parent
150eeb1101
commit
6c85ee4777
5 changed files with 55 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs
  2. 54
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/dashboard-manager.js
  3. 103
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js
  4. 1
      samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs
  5. 2
      samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.js

1
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs
View File

@ -36,7 +36,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling
"/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js",
"/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery-form/jquery-form-extensions.js",
"/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js",
"/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/dashboard-manager.js",
"/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js",
"/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js",
"/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js",

54
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/dashboard-manager.js
View File

@ -1,54 +0,0 @@
(function ($) {
abp.DashboardManager = function (opts) {
if (typeof opts === 'string') {
opts = {
wrapper: opts
};
}
var $dashboardWrapper;
if (typeof opts.wrapper === 'string') {
$dashboardWrapper = $(opts.wrapper);
} else {
$dashboardWrapper = opts.wrapper;
}
var init = function () {
$dashboardWrapper.find('.abp-widget-wrapper').each(function () {
var widgetManager = new abp.WidgetManager({
wrapper: $(this),
filterCallback: opts.filterCallback || function () {
if (opts.filterForm) {
return opts.filterForm.serializeFormToObject();
}
return {};
}
});
widgetManager.init();
});
};
var refresh = function () {
$dashboardWrapper.find('.abp-widget-wrapper').each(function () {
var widgetManager = $(this).data('abp-widget-manager');
widgetManager && widgetManager.refresh();
});
};
if (opts.filterForm) {
opts.filterForm.submit(function (e) {
e.preventDefault();
refresh();
});
}
return {
init: init,
refresh: refresh
};
};
})(jQuery);

103
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/widget-manager.js
View File

@ -2,28 +2,29 @@
abp.widgets = abp.widgets || {};
abp.WidgetManager = function (opts) {
if (typeof opts === 'string') {
if (!opts) {
opts = {};
} else if (typeof opts === 'string') {
opts = {
wrapper: opts
};
}
var $widgetWrapperDiv;
if (typeof opts.wrapper === 'string') {
$widgetWrapperDiv = $(opts.wrapper);
} else {
$widgetWrapperDiv = opts.wrapper;
if (!opts.wrapper) {
opts.wrapper = $('body');
} else if (typeof opts.wrapper === 'string') {
opts.wrapper = $(opts.wrapper);
}
if (!$widgetWrapperDiv.hasClass('abp-widget-wrapper')) {
$widgetWrapperDiv = $widgetWrapperDiv.closest('.abp-widget-wrapper');
}
var getFilters = function () {
var getFilters = function ($widgetWrapperDiv) {
var filters = {};
if (opts.filterForm) {
filters = opts.filterForm.serializeFormToObject();
}
if (opts.filterCallback) {
filters = opts.filterCallback();
filters = $.extend(filters, opts.filterCallback());
}
var widgetApi = $widgetWrapperDiv.data('abp-widget-api');
@ -35,52 +36,54 @@
};
var init = function () {
var widgetName = $widgetWrapperDiv.attr('data-widget-name');
var widgetApiClass = abp.widgets[widgetName];
if (widgetApiClass) {
var widgetApi = new widgetApiClass($widgetWrapperDiv);
$widgetWrapperDiv.data('abp-widget-api', widgetApi);
if (widgetApi.init) {
widgetApi.init(getFilters($widgetWrapperDiv));
opts.wrapper.find('.abp-widget-wrapper').each(function () {
var $widgetWrapperDiv = $(this);
var widgetName = $widgetWrapperDiv.attr('data-widget-name');
var widgetApiClass = abp.widgets[widgetName];
if (widgetApiClass) {
var widgetApi = new widgetApiClass($widgetWrapperDiv);
$widgetWrapperDiv.data('abp-widget-api', widgetApi);
if (widgetApi.init) {
widgetApi.init(getFilters($widgetWrapperDiv));
}
}
}
});
};
var callRefreshWidgetApi = function () {
var widgetApi = $widgetWrapperDiv.data('abp-widget-api');
if (widgetApi && widgetApi.refresh) {
widgetApi.refresh(getFilters($widgetWrapperDiv));
}
}
var refresh = function () {
var refreshUrl = $widgetWrapperDiv.attr('data-refresh-url');
if (refreshUrl) {
abp.ajax({
url: refreshUrl,
type: 'GET',
dataType: 'html',
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
data: getFilters()
}).then(function (result) {
var $newWidgetWrapperDiv = $(result);
$widgetWrapperDiv.replaceWith($newWidgetWrapperDiv);
$widgetWrapperDiv = $newWidgetWrapperDiv;
$widgetWrapperDiv.data('abp-widget-manager', publicApi);
init();
});
} else {
callRefreshWidgetApi();
}
opts.wrapper.find('.abp-widget-wrapper').each(function () {
var $widgetWrapperDiv = $(this);
var refreshUrl = $widgetWrapperDiv.attr('data-refresh-url');
if (refreshUrl) {
abp.ajax({
url: refreshUrl,
type: 'GET',
dataType: 'html',
contentType: 'application/x-www-form-urlencoded; charset=UTF-8',
data: getFilters($widgetWrapperDiv)
}).then(function (result) {
$widgetWrapperDiv.replaceWith($(result));
});
} else {
var widgetApi = $widgetWrapperDiv.data('abp-widget-api');
if (widgetApi && widgetApi.refresh) {
widgetApi.refresh(getFilters($widgetWrapperDiv));
}
}
});
};
var publicApi = {
if (opts.filterForm) {
opts.filterForm.submit(function (e) {
e.preventDefault();
refresh();
});
}
return {
init: init,
refresh: refresh
};
$widgetWrapperDiv.data('abp-widget-manager', publicApi);
return publicApi;
};
})(jQuery);

1
samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs
View File

@ -115,6 +115,7 @@ namespace DashboardDemo.Web
{
Configure<VirtualFileSystemOptions>(options =>
{
options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<DashboardDemoDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Domain.Shared", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<DashboardDemoDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Domain", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<DashboardDemoApplicationContractsModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Application.Contracts", Path.DirectorySeparatorChar)));

2
samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.js
View File

@ -1,6 +1,6 @@
(function () {
var myDashboard = new abp.DashboardManager({
var myDashboard = new abp.WidgetManager({
wrapper: '#MyDashboardWidgetsArea',
filterForm: $('#MyDashboardFilterForm')
});

Write Preview
Loading…
Cancel
Save