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 0000000000..e7926406c3 Binary files /dev/null and b/frontend/public/templates/user_import.xlsx differ 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[]; // 面包屑 }