diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index ba21897..f90fcb1 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}已分配,不能删除"); } diff --git a/ZR.Vue/src/layout/components/Sidebar/Item.vue b/ZR.Vue/src/layout/components/Sidebar/Item.vue index b515f61..0b584e1 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 } diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js index 643618f..ee93a3e 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-后台管理', /** * 主题颜色