Merge branch 'master' into net6.0

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}已分配,不能删除");
                 }

ZR.Vue/src/layout/components/Sidebar/Item.vue

@@ -17,11 +17,19 @@ export default {
     const vnodes = []
 
     if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
+      vnodes.push(<svg-icon icon-class={icon} />)
     }
 
     if (title) {
-      vnodes.push(<span slot='title'>{(title)}</span>)
+      if (title.length > 5) {
+        vnodes.push(
+          <span slot='title' title={title}>
+            {title}
+          </span>
+        )
+      } else {
+        vnodes.push(<span slot='title'>{title}</span>)
+      }
     }
     return vnodes
   }

ZR.Vue/src/settings.js

@@ -2,7 +2,7 @@ module.exports = {
   /**
    * 框架版本号
    */
-  version: '3.7.7',
+  version: '3.7.8',
   title: 'ZrAdmin.NET-后台管理',
   /**
    * 主题颜色