diff --git a/src/PearAdmin.AbpTemplate.Admin/Controllers/AuditLogsController.cs b/src/PearAdmin.AbpTemplate.Admin/Controllers/AuditLogsController.cs index af087edac60e36f3149604bd25c46d4a5fdf32ad..032a0b8259a2dbac2ba8fe559f74e17526766b24 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Controllers/AuditLogsController.cs +++ b/src/PearAdmin.AbpTemplate.Admin/Controllers/AuditLogsController.cs @@ -42,4 +42,4 @@ namespace PearAdmin.AbpTemplate.Admin.Controllers return Json(new ResponseParamPagedViewModel(pagedAuditLogList.TotalCount, pagedAuditLogList.Items)); } } -} +} \ No newline at end of file diff --git a/src/PearAdmin.AbpTemplate.Admin/Resources/IWebResourceManager.cs b/src/PearAdmin.AbpTemplate.Admin/Resources/IWebResourceManager.cs deleted file mode 100644 index 865f8eaed067eb0047829b70c203906451a85047..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Resources/IWebResourceManager.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using Microsoft.AspNetCore.Mvc.Razor; - -namespace PearAdmin.AbpTemplate.Admin.Resources -{ - public interface IWebResourceManager - { - void AddScript(string url, bool addMinifiedOnProd = true); - - IReadOnlyList GetScripts(); - - HelperResult RenderScripts(); - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/Resources/WebResourceManager.cs b/src/PearAdmin.AbpTemplate.Admin/Resources/WebResourceManager.cs deleted file mode 100644 index 74d8230fdf3b7aa428b3966782360a94f9f4ec23..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Resources/WebResourceManager.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Generic; -using System.Collections.Immutable; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc.Razor; -using Abp.Collections.Extensions; -using Abp.Extensions; -using Abp.Timing; -using Microsoft.Extensions.Hosting; - -namespace PearAdmin.AbpTemplate.Admin.Resources -{ - public class WebResourceManager : IWebResourceManager - { - private readonly IWebHostEnvironment _environment; - private readonly List _scriptUrls; - - public WebResourceManager(IWebHostEnvironment environment) - { - _environment = environment; - _scriptUrls = new List(); - } - - public void AddScript(string url, bool addMinifiedOnProd = true) - { - _scriptUrls.AddIfNotContains(NormalizeUrl(url, "js")); - } - - public IReadOnlyList GetScripts() - { - return _scriptUrls.ToImmutableList(); - } - - public HelperResult RenderScripts() - { - return new HelperResult(async writer => - { - foreach (var scriptUrl in _scriptUrls) - { - await writer.WriteAsync($""); - } - }); - } - - private string NormalizeUrl(string url, string ext) - { - if (_environment.IsDevelopment()) - { - return url; - } - - if (url.EndsWith(".min." + ext)) - { - return url; - } - - return url.Left(url.Length - ext.Length) + "min." + ext; - } - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/ViewResources/AbpTemplateNavigationProvider.cs b/src/PearAdmin.AbpTemplate.Admin/ViewResources/AbpTemplateNavigationProvider.cs deleted file mode 100644 index 838c9f4a56d77ec44ef7c2243c819b8af0b24b38..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/ViewResources/AbpTemplateNavigationProvider.cs +++ /dev/null @@ -1,164 +0,0 @@ -using Abp.Application.Navigation; -using Abp.Authorization; -using Abp.Localization; -using PearAdmin.AbpTemplate.Authorization; - -namespace PearAdmin.AbpTemplate.Admin.ViewResources -{ - /// - /// 菜单定义 - /// - public class AbpTemplateNavigationProvider : NavigationProvider - { - public override void SetNavigation(INavigationProviderContext context) - { - context.Manager.MainMenu - .AddItem( - new MenuItemDefinition( - PageNames.WorkSpace, - L("WorkSpace"), - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_WorkSpace) - ).AddItem( - new MenuItemDefinition( - PageNames.TenantConsole, - L("TenantConsole"), - url: "/WorkSpace/TenantConsole", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_WorkSpace_TenantConsole) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.HostConsole, - L("HostConsole"), - url: "/WorkSpace/HostConsole", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_WorkSpace_HostConsole) - ) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.TaskCenter, - L("TaskCenter"), - icon: "layui-icon-read", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_TaskCenter) - ).AddItem( - new MenuItemDefinition( - PageNames.DailyTask, - L("DailyTask"), - url: "/TaskCenter/DailyTask", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_TaskCenter_DailyTasks) - ) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.ResourceManagement, - L("ResourceManagement"), - icon: "layui-icon-engine", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_ResourceManagement) - ).AddItem( - new MenuItemDefinition( - PageNames.DataDictionary, - L("DataDictionary"), - url: "/Resource/DataDictionary", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_ResourceManagement_DataDictionary) - ) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.SystemManagement, - L("SystemManagement"), - icon: "layui-icon-set-fill", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement) - ).AddItem( - new MenuItemDefinition( - PageNames.OrganizationUnits, - L("OrganizationUnitManagement"), - url: "OrganizationUnits", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_OrganizationUnits) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.Users, - L("UserManagement"), - url: "Users", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_Users) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.Roles, - L("RoleManagement"), - url: "Roles", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_Roles) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.Permissions, - L("PermissionManagement"), - url: "Permissions", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_Permissions) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.AuditLogs, - L("AuditLogs"), - url: "AuditLogs", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_AuditLogs) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.Editions, - L("EditionManagement"), - url: "Editions", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_Editions) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.Tenants, - L("TenantManagement"), - url: "Tenants", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_Tenants) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.TenantSettings, - L("TenantSettings"), - url: "TenantSettings", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_TenantSettings) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.HostSettings, - L("HostSettings"), - url: "HostSettings", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_HostSettings) - ) - ).AddItem( - new MenuItemDefinition( - PageNames.Maintenance, - L("Maintenance"), - url: "Maintenance", - icon: "layui-icon-console", - permissionDependency: new SimplePermissionDependency(AppPermissionNames.Pages_SystemManagement_Maintenance) - ) - ) - ); - } - - private static ILocalizableString L(string name) - { - return new LocalizableString(name, AbpTemplateCoreConsts.LocalizationSourceName); - } - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/ViewResources/PageNames.cs b/src/PearAdmin.AbpTemplate.Admin/ViewResources/PageNames.cs deleted file mode 100644 index 4e2066b80513f785cdcab8645bbdb9b4cb3941f3..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/ViewResources/PageNames.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace PearAdmin.AbpTemplate.Admin.ViewResources -{ - public class PageNames - { - #region GlobalPage - public const string HomePage = "HomePage"; - #endregion - - #region SystemManagement - public const string SystemManagement = "SystemManagement"; - public const string OrganizationUnits = "OrganizationUnits"; - public const string Users = "Users"; - public const string Roles = "Roles"; - public const string Permissions = "Permissions"; - public const string AuditLogs = "AuditLogs"; - public const string Editions = "Editions"; - public const string Tenants = "Tenants"; - public const string TenantSettings = "HostSettings"; - public const string HostSettings = "HostSettings"; - public const string Maintenance = "Maintenance"; - #endregion - - #region ResourceManagement - public const string ResourceManagement = "ResourceManagement"; - public const string DataDictionary = "DataDictionary"; - #endregion - - #region TaskCenter - public const string TaskCenter = "TaskCenter"; - public const string DailyTask = "DailyTask"; - #endregion - - #region WorkSpace - public const string WorkSpace = "WorkSpace"; - public const string TenantConsole = "TenantConsole"; - public const string HostConsole = "HostConsole"; - #endregion - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml deleted file mode 100644 index a8801f1543376322f33df199cfc3c9d7c4983f1a..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_Layout.cshtml +++ /dev/null @@ -1,38 +0,0 @@ -@using Abp.Configuration.Startup -@using Abp.Web.Mvc.Alerts -@using Abp.Web.Security.AntiForgery -@using PearAdmin.AbpTemplate.Admin.Resources -@inject IAbpAntiForgeryManager AbpAntiForgeryManager -@inject IMultiTenancyConfig MultiTenancyConfig -@inject IWebResourceManager WebResourceManager -@inject IAlertManager AlertManager -@inject ILanguageManager LanguageManager -@{ - AbpAntiForgeryManager.SetCookie(Context); - - var pageTitle = !string.IsNullOrWhiteSpace(ViewBag.Title) ? ViewBag.Title + " / " : ""; - pageTitle += "AbpTemplate"; -} - - - - - - - - @pageTitle - - - @RenderSection("styles", required: false) - - - - @RenderBody() - - - - @RenderSection("scripts", required: false) - @WebResourceManager.RenderScripts() - - - diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_ViewStart.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_ViewStart.cshtml deleted file mode 100644 index 11648b53778c44a3e0fce7be48c5a693d3fbb41a..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Chat/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "~/Views/Chat/_Layout.cshtml"; -} diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml index 722092144f7082a18c3df7f1656cb034a12bb71a..f33fc97bdfbb8bc9e2ba1a78ecc2205e24d5c69c 100644 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml +++ b/src/PearAdmin.AbpTemplate.Admin/Views/Home/Index.cshtml @@ -20,6 +20,12 @@
    +
  • + +
  • @@ -52,11 +58,6 @@
    - -
    -
    -
    -
    @@ -70,8 +71,7 @@ var layer = layui.layer; var hash = layui.hash; var abp = layui.abp; - var interval = ""; - var chatPanelIndex = ""; + var currMessageIndex = ""; var config = { logo: { @@ -155,21 +155,6 @@ return $(".layui-body .layui-tab-content .layui-show")[0].children[0].contentWindow; } - window.openChatPanel = function () { - chatPanelIndex = layer.open({ - type: 2, - title: "飞鸽传书", - content: "@Url.Action("Index", "Chat")", - area: ["1000px","643px"], - shade: 0.3, - shadeClose: true, - resize:false, - end:function(){ - chatPanelIndex = ""; - } - }); - } - function loadUnreadNotificationCount() { abp.ajax({ url: "@Url.Action("GetUnreadNotificationCount", "Notifications")", @@ -191,17 +176,26 @@ abpHandleError: false }).done(function (data) { if (data.code == 200 && data.data > 0) { - messageReceived(); + messageUnread(); } }).fail(function (jqXHR) { layer.msg(jqXHR.message, { icon: 5 }); }); } - $("body").on("click", ".pear-social-entrance", function () { - openChatPanel(); - clearInterval(interval); - interval = ""; + $(".social").click(function () { + currMessageIndex = layer.open({ + type: 2, + title: "传音", + content: "@Url.Action("Index", "Chat")", + area: ["1000px","645px"], + shade: 0.3, + shadeClose: true, + resize: true, + end: function () { + currMessageIndex = ""; + } + }); }); $(".notice").click(function () { @@ -215,7 +209,9 @@ }); abp.event.on('app.chat.messageReceived', function (message) { - messageReceived(); + if (currMessageIndex == "") { + messageUnread(); + } }); abp.event.on('abp.notifications.received', function (userNotification) { @@ -227,16 +223,8 @@ $("#headerNotice").addClass("layui-badge-dot"); } - function messageReceived() { - if (interval == "" && chatPanelIndex == "") { - interval = window.setInterval(function(){ - if ($(".pear-social-entrance").css("display") == "none") { - $(".pear-social-entrance").css("display", ""); - } else { - $(".pear-social-entrance").css("display", "none"); - } - }, 500); - } + function messageUnread() { + $("#headerMessage").addClass("layui-badge-dot"); } var init = function () { diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/ChangeModalViewModel.cs b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/ChangeModalViewModel.cs deleted file mode 100644 index 8d81113ea433c7e5722cc54bd116a8dea6baccb1..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/ChangeModalViewModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PearAdmin.AbpTemplate.Admin.Views.Shared.Components.TenantChange -{ - public class ChangeModalViewModel - { - public string TenancyName { get; set; } - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/Default.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/Default.cshtml deleted file mode 100644 index 82c8a2318497cb58db77ea3477428455ac1e2600..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/Default.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@using PearAdmin.AbpTemplate.Admin.Resources -@inject IWebResourceManager WebResourceManager -@{ - WebResourceManager.AddScript(ApplicationPath + "view-resources/Views/Shared/Components/TenantChange/Default.js"); -} -
    - - @L("CurrentTenant"): - - @if (Model.Tenant != null) - { - @Model.Tenant.TenancyName - } - else - { - @L("NotSelected") - } - - (@L("Change")) - -
    - diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/TenantChangeViewComponent.cs b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/TenantChangeViewComponent.cs deleted file mode 100644 index 17c0f3f8b853385e304023c2bf3d37cdaef1d82c..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/TenantChangeViewComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Threading.Tasks; -using Abp.ObjectMapping; -using PearAdmin.AbpTemplate.Sessions; -using Microsoft.AspNetCore.Mvc; - -namespace PearAdmin.AbpTemplate.Admin.Views.Shared.Components.TenantChange -{ - public class TenantChangeViewComponent : AbpTemplateViewComponent - { - private readonly ISessionAppService _sessionAppService; - private readonly IObjectMapper _objectMapper; - - public TenantChangeViewComponent(ISessionAppService sessionAppService, IObjectMapper objectMapper) - { - _sessionAppService = sessionAppService; - _objectMapper = objectMapper; - } - - public async Task InvokeAsync() - { - var loginInfo = await _sessionAppService.GetCurrentLoginInformations(); - var model = _objectMapper.Map(loginInfo); - return View(model); - } - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/TenantChangeViewModel.cs b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/TenantChangeViewModel.cs deleted file mode 100644 index b8673ad7862c3653a5c421f6dce2388da5be0103..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/TenantChangeViewModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Abp.AutoMapper; -using PearAdmin.AbpTemplate.Sessions.Dto; - -namespace PearAdmin.AbpTemplate.Admin.Views.Shared.Components.TenantChange -{ - [AutoMapFrom(typeof(GetCurrentLoginInformationsOutput))] - public class TenantChangeViewModel - { - public TenantLoginInfoDto Tenant { get; set; } - } -} diff --git a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/_ChangeModal.cshtml b/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/_ChangeModal.cshtml deleted file mode 100644 index 86daaa8dcbc2d0918977a74463b2eb7742dfcacd..0000000000000000000000000000000000000000 --- a/src/PearAdmin.AbpTemplate.Admin/Views/Shared/Components/TenantChange/_ChangeModal.cshtml +++ /dev/null @@ -1,23 +0,0 @@ -@using Abp.MultiTenancy -@using PearAdmin.AbpTemplate.Admin.Models.Common.Modals -@using PearAdmin.AbpTemplate.Admin.Views.Shared.Components.TenantChange -@model ChangeModalViewModel -@{ - Layout = null; -} -@await Html.PartialAsync("~/Views/Shared/Modals/_ModalHeader.cshtml", new ModalHeaderViewModel(L("ChangeTenant"))) - -
    -
    -
    - -
    - -
    -
    - @L("LeaveEmptyToSwitchToHost") -
    - @await Html.PartialAsync("~/Views/Shared/Modals/_ModalFooterWithSaveAndCancel.cshtml") -
    - - diff --git a/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/module/social.css b/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/module/social.css index 29650d0cf4f860f21d4907623617953b524dcb63..b1b35f0574f3bce8617c5482901a38664e4783ff 100644 --- a/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/module/social.css +++ b/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/module/social.css @@ -15,8 +15,8 @@ } .pear-social { - width: 1000px; - height: 600px; + width: 100%; + height: 100%; top: 0px; left: 0px; background-color: whitesmoke; @@ -278,7 +278,7 @@ } .pear-social-body-content-input-tool { - border-top: 1px solid #ececec; + border-top: 1px solid #dfdbdb; height: 40px; width: 100%; line-height: 40px; diff --git a/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/pear.css b/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/pear.css index 2a6ed05d977511d6159b40ee13352599a5e3a6f0..31e2a2e8c0b9064776bca584456085608e4c4350 100644 --- a/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/pear.css +++ b/src/PearAdmin.AbpTemplate.Admin/wwwroot/libs/pear/css/pear.css @@ -23,4 +23,5 @@ @import url("module/step.css"); @import url("module/card.css"); @import url("module/tab.css"); -@import url("module/tag.css"); \ No newline at end of file +@import url("module/tag.css"); +@import url("module/social.css"); \ No newline at end of file