From 64274427a9357476ed01e7be167bed7201559446 Mon Sep 17 00:00:00 2001 From: baiqi Date: Fri, 21 Jul 2023 15:28:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4&?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B7=AF=E7=94=B1=E4=B8=8D=E7=BC=93=E5=AD=98?= =?UTF-8?q?&=E5=85=AC=E5=85=B1=E9=9D=99=E6=80=81=E6=A8=A1=E6=9D=BF&husky?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=20TS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/.husky/pre-commit | 2 +- frontend/README.md | 2 +- frontend/public/templates/user_import.xlsx | Bin 0 -> 8876 bytes frontend/src/layout/default-layout.vue | 5 +++-- frontend/src/router/routes/types.ts | 2 +- frontend/src/router/typings.d.ts | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 frontend/public/templates/user_import.xlsx diff --git a/frontend/.husky/pre-commit b/frontend/.husky/pre-commit index 36eb360621..ab0749e263 100755 --- a/frontend/.husky/pre-commit +++ b/frontend/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -cd frontend && npm run lint-staged +cd frontend && npm run type:check && npm run lint-staged diff --git a/frontend/README.md b/frontend/README.md index ecc6ce1dfd..4e8ebe9ad4 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -360,7 +360,7 @@ export default function usePermission() { - + diff --git a/frontend/public/templates/user_import.xlsx b/frontend/public/templates/user_import.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e7926406c382a75041c1a286620c1d2e666f7066 GIT binary patch literal 8876 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 U{yeOxkN*Gx{b(0U^yK&d0B<*4>;M1& literal 0 HcmV?d00001 diff --git a/frontend/src/layout/default-layout.vue b/frontend/src/layout/default-layout.vue index 7123e41334..992ae6f6d2 100644 --- a/frontend/src/layout/default-layout.vue +++ b/frontend/src/layout/default-layout.vue @@ -34,14 +34,15 @@ - + @@ -170,7 +171,7 @@ .arco-layout-content { padding: 16px 16px 16px 0; min-width: 1000px; - height: calc(100vh - 72px); + min-height: 500px; } } diff --git a/frontend/src/router/routes/types.ts b/frontend/src/router/routes/types.ts index f924e3b6b6..11eebba356 100644 --- a/frontend/src/router/routes/types.ts +++ b/frontend/src/router/routes/types.ts @@ -17,7 +17,7 @@ export interface RouteMeta { activeMenu?: string; // 激活状态 order?: number; // 排序权重 noAffix?: boolean; // tab展示设置，设置为true则不在tab列表展示激活页面的tab - ignoreCache?: boolean; // 缓存设置，true则不缓存 + isCache?: boolean; // 缓存设置，true则不缓存 isTopMenu?: boolean; // 是否为顶部菜单 breadcrumbs?: BreadcrumbItem[]; // 面包屑 } diff --git a/frontend/src/router/typings.d.ts b/frontend/src/router/typings.d.ts index 8330852be4..405643517e 100644 --- a/frontend/src/router/typings.d.ts +++ b/frontend/src/router/typings.d.ts @@ -11,7 +11,7 @@ declare module 'vue-router' { activeMenu?: string; // 激活状态 order?: number; // 排序权重 noAffix?: boolean; // tab展示设置，设置为true则不在tab列表展示激活页面的tab - ignoreCache?: boolean; // 缓存设置，true则不缓存 + isCache?: boolean; // 缓存设置，true则不缓存 isTopMenu?: boolean; // 是否为顶部菜单 breadcrumbs?: BreadcrumbItem[]; // 面包屑 }