From d754d42b9dd5234e553d47110f3b64f3862df1f5 Mon Sep 17 00:00:00 2001 From: Argo-2016 Date: Thu, 2 Jan 2020 17:17:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(#I17P4U):=20=E8=A7=92=E8=89=B2=E5=AF=B9?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=88=E6=9D=83=E7=95=8C=E9=9D=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=80=E5=B1=9E=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #Issue close https://gitee.com/LongbowEnterprise/BootstrapAdmin/issues/I17P4U?from=project-issue --- src/admin/Bootstrap.Admin/wwwroot/css/site.css | 4 ++++ src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js | 10 +++++++--- .../Bootstrap.DataAccess/Bootstrap.DataAccess.csproj | 3 ++- .../Bootstrap.Client.DataAccess.csproj | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/site.css b/src/admin/Bootstrap.Admin/wwwroot/css/site.css index 15f1c2cc..84672652 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/site.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/site.css @@ -350,6 +350,10 @@ body.trans-mute * { } .dd3-content .menuType { + right: 100px; + } + + .dd3-content .menuApp { right: 45px; } diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js index 56c11cde..c797f52a 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js @@ -1,4 +1,4 @@ -(function ($) { +(function ($) { $.fn.extend({ autoScrollSidebar: function (options) { var option = $.extend({ target: null, offsetTop: 0 }, options); @@ -127,14 +127,18 @@ return ret; }; + var formatApplicationName = function (app) { + return app; + } + var cascadeMenu = function (menus) { var html = ""; $.each(menus, function (index, menu) { if (menu.Menus.length === 0) { - html += $.format('
  • {5}{4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, formatCategoryName(menu), menu.IsResource); + html += $.format('
  • {5}{7}{4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, menu.Order, formatCategoryName(menu), menu.IsResource, formatApplicationName(menu.Application)); } else { - html += $.format('
  • {6}{5}
      {4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, cascadeMenu(menu.Menus), menu.Order, formatCategoryName(menu), menu.IsResource); + html += $.format('
  • {6}{8}{5}
      {4}
    • ', menu.Id, menu.Icon, menu.Name, menu.Category, cascadeMenu(menu.Menus), menu.Order, formatCategoryName(menu), menu.IsResource, formatApplicationName(menu.Application)); } }); return html; diff --git a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj index 4a0d01ae..3c7811c2 100644 --- a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj +++ b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj @@ -5,8 +5,9 @@ - + + diff --git a/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj index 07a21b14..2d7267c9 100644 --- a/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj +++ b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj @@ -5,7 +5,7 @@ - +