From 22ba88a92cbae4e45132eb75213257c94a6e9d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Tue, 15 Mar 2022 15:52:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/System/SysDictService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index ba218972..f90fcb11 100644 --- a/ZR.Service/System/SysDictService.cs +++ b/ZR.Service/System/SysDictService.cs @@ -63,7 +63,7 @@ namespace ZR.Service.System foreach (var dictId in dictIds) { SysDictType dictType = DictRepository.GetFirst(x => x.DictId == dictId); - if (DictRepository.Count(f => f.DictType == dictType.DictType) > 0) + if (DictDataRepository.Count(f => f.DictType == dictType.DictType) > 0) { throw new CustomException($"{dictType.DictName}已分配,不能删除"); } From c9ee8d8cc33e47aec4df0e6b8459931a61662385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Tue, 15 Mar 2022 16:55:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=82=AC=E5=81=9C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Vue/src/layout/components/Sidebar/Item.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ZR.Vue/src/layout/components/Sidebar/Item.vue b/ZR.Vue/src/layout/components/Sidebar/Item.vue index b515f615..0b584e11 100644 --- a/ZR.Vue/src/layout/components/Sidebar/Item.vue +++ b/ZR.Vue/src/layout/components/Sidebar/Item.vue @@ -17,11 +17,19 @@ export default { const vnodes = [] if (icon) { - vnodes.push() + vnodes.push() } if (title) { - vnodes.push({(title)}) + if (title.length > 5) { + vnodes.push( + + {title} + + ) + } else { + vnodes.push({title}) + } } return vnodes } From 166975802b84da8c7606ce2cbcc870c315dc5ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Wed, 16 Mar 2022 19:55:36 +0800 Subject: [PATCH 3/3] v3.7.8 --- ZR.Vue/src/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js index 643618f9..ee93a3e5 100644 --- a/ZR.Vue/src/settings.js +++ b/ZR.Vue/src/settings.js @@ -2,7 +2,7 @@ module.exports = { /** * 框架版本号 */ - version: '3.7.7', + version: '3.7.8', title: 'ZrAdmin.NET-后台管理', /** * 主题颜色