Merge branch 'template' of https://github.com/meadmin-cn/meadmin-temp…

…late into template
meadmin-cn · Sep 22, 2022 · 047af6f · 047af6f
2 parents e0e5a4b + af84a4b
commit 047af6f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/src/layout/components/menu/index.vue b/src/layout/components/menu/index.vue
@@ -116,16 +116,18 @@ const menuTextColor = computed(() => mixColor(themeConfig.menuBg, menuActiveColo
 .collapse {
   :deep(.layout-menu-content) {
     width: calc(var(--el-menu-icon-width) + var(--el-menu-base-level-padding) * 2);
-
-    .title {
-      width: calc(var(--el-menu-icon-width) + var(--el-menu-base-level-padding) * 2);
-      text-align: center;
-      margin: 0;
-
-      span {
-        display: none;
-      }
+    span {
+      visibility: hidden;
     }
+    // .title {
+    //   width: calc(var(--el-menu-icon-width) + var(--el-menu-base-level-padding) * 2);
+    //   text-align: center;
+    //   margin: 0;
+
+    //   span {
+    //     display: none;
+    //   }
+    // }
   }
 }
 </style>
diff --git a/src/locales/lang/en/index.ts b/src/locales/lang/en/index.ts
@@ -1,5 +1,5 @@
 import { forOwn } from 'lodash-es';
-const modules = import.meta.glob('./*.json', { eager: true, import: 'default' });
+const modules = import.meta.glob('./**/*.{json,ts}', { eager: true, import: 'default' });
 const langs = {} as Record<string, string>;
 forOwn(modules, (value) => {
   Object.assign(langs, value);

diff --git a/src/locales/lang/en/menu.json b/src/locales/lang/en/menu.json
@@ -9,5 +9,6 @@
   "多级菜单1": "Multilevel Menu 1",
   "多级菜单1-1": "Multilevel Menu 1-1",
   "多级菜单1-1-1": "Multilevel Menu 1-1-1",
-  "多级菜单1-2": "Multilevel Menu 1-2"
+  "多级菜单1-2": "Multilevel Menu 1-2",
+  "外链": "Backlinks"
 }
diff --git a/src/locales/lang/zh-cn/index.ts b/src/locales/lang/zh-cn/index.ts
@@ -1,5 +1,5 @@
 import { forOwn } from 'lodash-es';
-const modules = import.meta.glob('./*.json', { eager: true, import: 'default' });
+const modules = import.meta.glob('./**/*.{json,ts}', { eager: true, import: 'default' });
 const langs = {} as Record<string, string>;
 forOwn(modules, (value) => {
   Object.assign(langs, value);

diff --git a/src/styles/index.scss b/src/styles/index.scss
@@ -43,11 +43,8 @@ html {
 }
 
 //去a标签默认样式
-a:hover,
-a:visited,
-a:link,
-a:active {
-  color: inherit;
+a {
+  color: unset;
   text-decoration: none;
 }
 
@@ -75,3 +72,7 @@ a:active {
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 3;
 }
+.popover-scrollbar-y {
+  margin: 0 -12px;
+  padding: 0 12px;
+}
diff --git a/vite.config.ts b/vite.config.ts
@@ -188,5 +188,9 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
         },
       },
     },
+    optimizeDeps: {
+      //因为项目中很多用到了自动引入和动态加载，所以vite首次扫描依赖项会扫描不全，这里强制扫描全局。
+      entries: ['./src/**/*.{ts,vue}'],
+    },
   };
 };