From 35c3dd78ec7d6944f19237a5ec6ff74dd75bd3e5 Mon Sep 17 00:00:00 2001 From: vben Date: Sun, 9 Jun 2024 13:31:43 +0800 Subject: [PATCH] chore: format code --- .prettierignore | 1 + .stylelintignore | 1 + apps/web-antd/src/layouts/basic.vue | 4 +- .../views/_essential/authentication/login.vue | 4 +- .../_essential/fallback/internal-error.vue | 2 +- .../src/configs/perfectionist.ts | 36 ++- .../src/components/layout-footer.vue | 2 +- .../layout-ui/src/components/layout-side.vue | 6 +- .../@core/uikit/layout-ui/src/vben-layout.ts | 10 +- .../@core/uikit/layout-ui/src/vben-layout.vue | 38 +-- .../uikit/menu-ui/src/components/menu.vue | 2 +- .../uikit/menu-ui/src/components/sub-menu.vue | 10 +- packages/@core/uikit/menu-ui/src/sub-menu.vue | 6 +- .../src/components/avatar/avatar.vue | 2 +- .../breadcrumb/breadcrumb-background.vue | 2 +- .../src/components/breadcrumb/breadcrumb.vue | 6 +- .../components/context-menu/context-menu.vue | 6 +- .../dropdown-menu/dropdown-radio-menu.vue | 6 +- .../floating-button-group.vue | 4 +- .../input-password/password-strength.vue | 2 +- .../shadcn-ui/src/components/input/input.vue | 2 +- .../shadcn-ui/src/components/logo/logo.vue | 6 +- .../components/menu-badge/menu-badge-dot.vue | 4 +- .../src/components/menu-badge/menu-badge.vue | 2 +- .../src/components/pin-input/input.vue | 6 +- .../components/ui/breadcrumb/Breadcrumb.vue | 2 +- .../ui/breadcrumb/BreadcrumbEllipsis.vue | 4 +- .../ui/breadcrumb/BreadcrumbPage.vue | 6 +- .../ui/breadcrumb/BreadcrumbSeparator.vue | 4 +- .../components/ui/scroll-area/ScrollArea.vue | 2 +- .../components/chrome-tabs/tab-background.vue | 4 +- .../src/components/chrome-tabs/tab.vue | 2 +- .../src/components/chrome-tabs/tabs.vue | 12 +- .../src/authentication/code-login.vue | 16 +- .../src/authentication/forget-password.vue | 4 +- .../common-ui/src/authentication/login.vue | 16 +- .../common-ui/src/authentication/register.vue | 14 +- .../authentication/widgets/color-toggle.vue | 2 +- .../authentication/widgets/layout-toggle.vue | 2 +- .../common-ui/src/fallback/icons/icon-403.vue | 28 +- .../common-ui/src/fallback/icons/icon-500.vue | 150 +++++----- .../src/global-search/search-panel.vue | 8 +- .../preferences/blocks/general/animation.vue | 4 +- .../preferences/blocks/layout/breadcrumb.vue | 2 +- .../src/preferences/blocks/layout/header.vue | 2 +- .../preferences/blocks/layout/navigation.vue | 2 +- .../src/preferences/blocks/select-item.vue | 2 +- .../src/preferences/blocks/switch-item.vue | 2 +- .../src/preferences/blocks/toggle-item.vue | 8 +- .../src/preferences/preferences-widget.vue | 279 ++++++------------ .../common-ui/src/preferences/preferences.vue | 26 +- .../common-ui/src/preferences/trigger.vue | 2 +- .../src/theme-toggle/theme-toggle.vue | 4 +- .../src/user-dropdown/user-dropdown.vue | 4 +- .../src/authentication/authentication.vue | 2 +- .../layouts/src/authentication/from-view.vue | 2 +- .../layouts/src/basic/content/content.vue | 4 +- .../layouts/src/basic/header/header.vue | 2 +- .../business/layouts/src/basic/layout.vue | 92 +++--- .../layouts/src/basic/menu/extra-menu.vue | 2 +- .../business/layouts/src/basic/menu/menu.vue | 8 +- .../layouts/src/basic/menu/mixed-menu.vue | 6 +- .../business/layouts/src/basic/tabs/tabs.vue | 6 +- .../layouts/src/basic/widgets/breadcrumb.vue | 4 +- .../layouts/src/iframe/iframe-router-view.vue | 2 +- 65 files changed, 419 insertions(+), 494 deletions(-) diff --git a/.prettierignore b/.prettierignore index 8c038738..43acec58 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,6 +3,7 @@ dist .output.js node_modules .nvmrc +coverage **/*.svg diff --git a/.stylelintignore b/.stylelintignore index 90c340b0..f4b2db2c 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -1,3 +1,4 @@ dist public __tests__ +coverage diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue index 7f7b8c6f..174058aa 100644 --- a/apps/web-antd/src/layouts/basic.vue +++ b/apps/web-antd/src/layouts/basic.vue @@ -96,16 +96,16 @@ function handleNoticeClear() { diff --git a/apps/web-antd/src/views/_essential/authentication/login.vue b/apps/web-antd/src/views/_essential/authentication/login.vue index 78b03a6f..2fb76ea8 100644 --- a/apps/web-antd/src/views/_essential/authentication/login.vue +++ b/apps/web-antd/src/views/_essential/authentication/login.vue @@ -69,9 +69,9 @@ const loginLoading = computed(() => { diff --git a/apps/web-antd/src/views/_essential/fallback/internal-error.vue b/apps/web-antd/src/views/_essential/fallback/internal-error.vue index bca08e3d..bf581764 100644 --- a/apps/web-antd/src/views/_essential/fallback/internal-error.vue +++ b/apps/web-antd/src/views/_essential/fallback/internal-error.vue @@ -3,5 +3,5 @@ import { Fallback } from '@vben/common-ui'; diff --git a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts index 86814fa4..250a4525 100644 --- a/internal/lint-configs/eslint-config/src/configs/perfectionist.ts +++ b/internal/lint-configs/eslint-config/src/configs/perfectionist.ts @@ -81,7 +81,41 @@ export async function perfectionist(): Promise { type: 'natural', }, ], - 'perfectionist/sort-vue-attributes': 'off', + 'perfectionist/sort-vue-attributes': [ + 'error', + { + // Based on: https://vuejs.org/style-guide/rules-recommended.html#element-attribute-order + 'custom-groups': { + /* eslint-disable perfectionist/sort-objects */ + DEFINITION: '*(is|:is|v-is)', + LIST_RENDERING: 'v-for', + CONDITIONALS: 'v-*(else-if|if|else|show|cloak)', + RENDER_MODIFIERS: 'v-*(pre|once)', + GLOBAL: '*(:id|id)', + UNIQUE: '*(ref|key|:ref|:key)', + SLOT: '*(v-slot|slot)', + TWO_WAY_BINDING: '*(v-model|v-model:*)', + // OTHER_DIRECTIVES e.g. 'v-custom-directive' + EVENTS: '*(v-on|@*)', + CONTENT: 'v-*(html|text)', + /* eslint-enable perfectionist/sort-objects */ + }, + groups: [ + 'DEFINITION', + 'LIST_RENDERING', + 'CONDITIONALS', + 'RENDER_MODIFIERS', + 'GLOBAL', + 'UNIQUE', + 'SLOT', + 'TWO_WAY_BINDING', + 'unknown', + 'EVENTS', + 'CONTENT', + ], + type: 'natural', + }, + ], }, }, ]; diff --git a/packages/@core/uikit/layout-ui/src/components/layout-footer.vue b/packages/@core/uikit/layout-ui/src/components/layout-footer.vue index 07a69017..409d26f5 100644 --- a/packages/@core/uikit/layout-ui/src/components/layout-footer.vue +++ b/packages/@core/uikit/layout-ui/src/components/layout-footer.vue @@ -65,8 +65,8 @@ const style = computed((): CSSProperties => {