From f758914f340b0fd43dcbf5172bb21562740d2b58 Mon Sep 17 00:00:00 2001 From: jiayun zhang Date: Sat, 17 Sep 2022 09:05:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20a=E6=A0=87=E7=AD=BE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=A0=B7=E5=BC=8F=E5=8E=BB=E9=99=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index acbf76b9..682e27a4 100644 --- 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; } From 81a18a31385dc84250e66dce55bf86b52201b4c8 Mon Sep 17 00:00:00 2001 From: jiayun zhang Date: Sat, 17 Sep 2022 09:20:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=94=B6=E8=B5=B7=E6=97=B6=EF=BC=8C=E6=84=9F=E8=A7=89=E5=8D=A1?= =?UTF-8?q?=E9=A1=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/menu/index.vue | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/layout/components/menu/index.vue b/src/layout/components/menu/index.vue index 4f858261..c0d61909 100644 --- 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; + // } + // } } } From 5635d36df0c12dcdfa75a9a9130f09c6a697d570 Mon Sep 17 00:00:00 2001 From: jiayun zhang Date: Tue, 20 Sep 2022 09:04:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?perf:=20=E5=BC=BA=E5=88=B6=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E9=A1=B9=E6=89=AB=E6=8F=8Fsrc,=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E9=A6=96=E6=AC=A1=E5=90=AF=E5=8A=A8=E5=8F=98=E6=85=A2?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E4=B8=8D=E4=BC=9A=E6=AF=8F=E6=AC=A1?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=89=93=E5=BC=80=E6=96=B0=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=83=BD=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vite.config.ts b/vite.config.ts index e78364b9..254a4c67 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -184,5 +184,9 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => { }, }, }, + optimizeDeps: { + //因为项目中很多用到了自动引入和动态加载，所以vite首次扫描依赖项会扫描不全，这里强制扫描全局。 + entries: ['./src/**/*.{ts,vue}'], + }, }; }; From b92081a5c9f7a2b3970fd80fd0c4a8bf9fa9b2d6 Mon Sep 17 00:00:00 2001 From: jiayun zhang Date: Tue, 20 Sep 2022 09:09:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E5=85=A8=E5=B1=80=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=8C=85=E6=94=AF=E6=8C=81=E5=BC=95=E5=85=A5ts?= =?UTF-8?q?=E3=80=81json=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=AD=90=E5=AD=99=E6=96=87=E4=BB=B6=E5=A4=B9=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/lang/en/index.ts | 2 +- src/locales/lang/en/menu.json | 3 ++- src/locales/lang/zh-cn/index.ts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/locales/lang/en/index.ts b/src/locales/lang/en/index.ts index ab778acf..ec046e32 100644 --- 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; forOwn(modules, (value) => { Object.assign(langs, value); diff --git a/src/locales/lang/en/menu.json b/src/locales/lang/en/menu.json index 1f07f77a..07bc2c96 100644 --- 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 index ab778acf..ec046e32 100644 --- 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; forOwn(modules, (value) => { Object.assign(langs, value); From af84a4bc06b06ad09ab20eca6edcbdd227647744 Mon Sep 17 00:00:00 2001 From: jiayun zhang Date: Tue, 20 Sep 2022 09:10:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=8A=A0=E4=B8=8A=E5=85=A8?= =?UTF-8?q?=E5=B1=80popover-scrollbar-y=20=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/index.scss b/src/styles/index.scss index 682e27a4..e31b84b2 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -72,3 +72,7 @@ a { -webkit-box-orient: vertical; -webkit-line-clamp: 3; } +.popover-scrollbar-y { + margin: 0 -12px; + padding: 0 12px; +}