From 517acada1aa1a1ce45d0b6eb2e76d1fd1082084a Mon Sep 17 00:00:00 2001 From: Vben Date: Sun, 11 Aug 2024 20:05:52 +0800 Subject: [PATCH] refactor: adjust all sample pages and use page components (#4118) --- .github/release-drafter.yml | 4 +- .vscode/settings.json | 3 +- apps/web-antd/src/views/demos/antd/index.vue | 66 +++++++------------ .../web-ele/src/views/demos/element/index.vue | 66 +++++++------------ .../web-naive/src/views/demos/naive/index.vue | 60 ++++++----------- .../web-naive/src/views/demos/table/index.vue | 8 +-- .../src/components/avatar/avatar.vue | 5 +- .../src/components/button/button.vue | 3 +- .../src/components/button/icon-button.vue | 4 +- .../components/context-menu/context-menu.vue | 7 +- .../src/components/hover-card/hover-card.vue | 15 ++--- .../src/components/input/interface.ts | 4 +- .../shadcn-ui/src/components/link/link.vue | 4 +- .../src/components/pin-input/interface.ts | 4 +- .../src/components/popover/popover.vue | 18 ++--- .../src/components/scrollbar/scrollbar.vue | 5 +- .../components/segmented/tabs-indicator.vue | 6 +- .../src/components/tooltip/tooltip.vue | 6 +- packages/effects/README.md | 2 +- .../ellipsis-text/ellipsis-text.vue | 15 +++-- .../{ => components}/ellipsis-text/index.ts | 0 .../effects/common-ui/src/components/index.ts | 2 + .../src/{ => components}/page/index.ts | 0 .../src/{ => components}/page/page-footer.vue | 0 .../src/{ => components}/page/page-header.vue | 6 +- .../src/{ => components}/page/page.ts | 4 +- .../src/{ => components}/page/page.vue | 14 ++-- packages/effects/common-ui/src/index.ts | 8 +-- .../common-ui/src/{ => ui}/about/about.ts | 0 .../common-ui/src/{ => ui}/about/about.vue | 24 +++---- .../common-ui/src/{ => ui}/about/index.ts | 0 .../{ => ui}/authentication/auth-title.vue | 0 .../{ => ui}/authentication/code-login.vue | 0 .../authentication/forget-password.vue | 0 .../src/{ => ui}/authentication/index.ts | 0 .../authentication/login-expired-modal.vue | 0 .../src/{ => ui}/authentication/login.vue | 0 .../{ => ui}/authentication/qrcode-login.vue | 0 .../src/{ => ui}/authentication/register.vue | 0 .../authentication/third-party-login.vue | 0 .../src/{ => ui}/authentication/typings.ts | 0 .../analysis/analysis-chart-card.vue | 0 .../analysis/analysis-charts-tabs.vue | 0 .../dashboard/analysis/analysis-overview.vue | 0 .../src/{ => ui}/dashboard/analysis/index.ts | 0 .../common-ui/src/{ => ui}/dashboard/index.ts | 0 .../src/{ => ui}/dashboard/typing.ts | 0 .../src/{ => ui}/dashboard/workbench/index.ts | 0 .../dashboard/workbench/workbench-header.vue | 0 .../dashboard/workbench/workbench-project.vue | 0 .../workbench/workbench-quick-nav.vue | 0 .../dashboard/workbench/workbench-todo.vue | 0 .../dashboard/workbench/workbench-trends.vue | 0 .../src/{ => ui}/fallback/fallback.ts | 0 .../src/{ => ui}/fallback/fallback.vue | 0 .../src/{ => ui}/fallback/icons/icon-403.vue | 0 .../src/{ => ui}/fallback/icons/icon-404.vue | 0 .../src/{ => ui}/fallback/icons/icon-500.vue | 0 .../fallback/icons/icon-coming-soon.vue | 0 .../{ => ui}/fallback/icons/icon-offline.vue | 0 .../src/{ => ui}/fallback/icons/warning.svg | 0 .../common-ui/src/{ => ui}/fallback/index.ts | 0 packages/effects/common-ui/src/ui/index.ts | 4 ++ .../src/views/demos/access/admin-visible.vue | 8 +-- .../src/views/demos/access/button-control.vue | 56 ++++++++-------- playground/src/views/demos/access/index.vue | 36 ++++------ .../src/views/demos/access/super-visible.vue | 8 +-- .../src/views/demos/access/user-visible.vue | 8 +-- .../src/views/demos/features/icons/index.vue | 22 +++---- .../demos/features/login-expired/index.vue | 29 ++++---- .../src/views/demos/features/tabs/index.vue | 32 ++++----- .../views/demos/features/tabs/tab-detail.vue | 12 ++-- .../views/demos/features/watermark/index.vue | 24 +++---- .../src/views/examples/ellipsis/data.ts | 2 - .../src/views/examples/ellipsis/index.vue | 61 +++++++++-------- 75 files changed, 282 insertions(+), 383 deletions(-) rename packages/effects/common-ui/src/{ => components}/ellipsis-text/ellipsis-text.vue (93%) rename packages/effects/common-ui/src/{ => components}/ellipsis-text/index.ts (100%) create mode 100644 packages/effects/common-ui/src/components/index.ts rename packages/effects/common-ui/src/{ => components}/page/index.ts (100%) rename packages/effects/common-ui/src/{ => components}/page/page-footer.vue (100%) rename packages/effects/common-ui/src/{ => components}/page/page-header.vue (71%) rename packages/effects/common-ui/src/{ => components}/page/page.ts (75%) rename packages/effects/common-ui/src/{ => components}/page/page.vue (63%) rename packages/effects/common-ui/src/{ => ui}/about/about.ts (100%) rename packages/effects/common-ui/src/{ => ui}/about/about.vue (93%) rename packages/effects/common-ui/src/{ => ui}/about/index.ts (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/auth-title.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/code-login.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/forget-password.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/index.ts (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/login-expired-modal.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/login.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/qrcode-login.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/register.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/third-party-login.vue (100%) rename packages/effects/common-ui/src/{ => ui}/authentication/typings.ts (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/analysis/analysis-chart-card.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/analysis/analysis-charts-tabs.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/analysis/analysis-overview.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/analysis/index.ts (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/index.ts (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/typing.ts (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/workbench/index.ts (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/workbench/workbench-header.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/workbench/workbench-project.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/workbench/workbench-quick-nav.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/workbench/workbench-todo.vue (100%) rename packages/effects/common-ui/src/{ => ui}/dashboard/workbench/workbench-trends.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/fallback.ts (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/fallback.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/icons/icon-403.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/icons/icon-404.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/icons/icon-500.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/icons/icon-coming-soon.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/icons/icon-offline.vue (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/icons/warning.svg (100%) rename packages/effects/common-ui/src/{ => ui}/fallback/index.ts (100%) create mode 100644 packages/effects/common-ui/src/ui/index.ts delete mode 100644 playground/src/views/examples/ellipsis/data.ts diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index f700c636..fd88affe 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -17,12 +17,14 @@ categories: - title: "🐞 Bug Fixes" labels: - "bug" + - title: "📈 Performance" + labels: + - "perf" - title: 📝 Documentation labels: - "documentation" - title: 👻 Maintenance labels: - - "perf" - "chore" - "dependencies" # collapse-after: 12 diff --git a/.vscode/settings.json b/.vscode/settings.json index 6a97d0aa..80950410 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -192,5 +192,6 @@ "i18n-ally.keystyle": "nested", "commentTranslate.multiLineMerge": true, "vue.server.hybridMode": true, - "typescript.tsdk": "node_modules/typescript/lib" + "typescript.tsdk": "node_modules/typescript/lib", + "vitest.disableWorkspaceWarning": true } diff --git a/apps/web-antd/src/views/demos/antd/index.vue b/apps/web-antd/src/views/demos/antd/index.vue index a9710f12..8286bebb 100644 --- a/apps/web-antd/src/views/demos/antd/index.vue +++ b/apps/web-antd/src/views/demos/antd/index.vue @@ -1,4 +1,6 @@ diff --git a/apps/web-ele/src/views/demos/element/index.vue b/apps/web-ele/src/views/demos/element/index.vue index 5ca94b73..dc02759f 100644 --- a/apps/web-ele/src/views/demos/element/index.vue +++ b/apps/web-ele/src/views/demos/element/index.vue @@ -41,54 +41,38 @@ function notify(type: NotificationType) { diff --git a/apps/web-naive/src/views/demos/naive/index.vue b/apps/web-naive/src/views/demos/naive/index.vue index d115ff24..41d55109 100644 --- a/apps/web-naive/src/views/demos/naive/index.vue +++ b/apps/web-naive/src/views/demos/naive/index.vue @@ -34,55 +34,35 @@ function notify(type: NotificationType) { diff --git a/apps/web-naive/src/views/demos/table/index.vue b/apps/web-naive/src/views/demos/table/index.vue index ae669052..ddc958bc 100644 --- a/apps/web-naive/src/views/demos/table/index.vue +++ b/apps/web-naive/src/views/demos/table/index.vue @@ -27,10 +27,10 @@ const data = [ diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue index 1e535f6f..b16f549b 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue @@ -5,7 +5,6 @@ import type { AvatarRootProps, } from 'radix-vue'; -import type { HTMLAttributes } from 'vue'; import { computed } from 'vue'; import { @@ -16,9 +15,9 @@ import { interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps { alt?: string; - class?: HTMLAttributes['class']; + class?: any; dot?: boolean; - dotClass?: HTMLAttributes['class']; + dotClass?: any; } defineOptions({ diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue index f0fddefe..cfe25ac6 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/button.vue @@ -1,5 +1,4 @@