From 20af961f09715fd248295ffc4e6675b53703c5fc Mon Sep 17 00:00:00 2001 From: vben Date: Tue, 21 May 2024 22:42:25 +0800 Subject: [PATCH] chore: update dir --- apps/antd-view/package.json | 3 +- .../src/{layout.vue => layouts/basic.vue} | 0 .../routes/layout.ts => layouts/index.ts} | 4 +- apps/antd-view/src/main.ts | 5 +- apps/antd-view/src/router/routes/builtin.ts | 3 +- apps/antd-view/src/router/routes/index.ts | 5 +- .../src/router/routes/modules/nested.ts | 4 +- .../src/router/routes/modules/outside.ts | 4 +- .../src/router/routes/modules/vben.ts | 5 +- apps/antd-view/vite.config.mts | 2 +- .../shared/design/src/scss/common/base.scss | 7 --- .../shared/toolkit/src/window.test.ts | 2 +- .../common-ui/src/authentication/login.vue | 1 + packages/hooks/src/index.ts | 2 - packages/styles/package.json | 49 +++++++++++++++++++ packages/styles/src/index.ts | 4 ++ packages/styles/tsconfig.json | 5 ++ packages/styles/vite.config.mts | 3 ++ pnpm-lock.yaml | 18 ++++--- vben-admin.code-workspace | 4 ++ 20 files changed, 94 insertions(+), 36 deletions(-) rename apps/antd-view/src/{layout.vue => layouts/basic.vue} (100%) rename apps/antd-view/src/{router/routes/layout.ts => layouts/index.ts} (62%) create mode 100644 packages/styles/package.json create mode 100644 packages/styles/src/index.ts create mode 100644 packages/styles/tsconfig.json create mode 100644 packages/styles/vite.config.mts diff --git a/apps/antd-view/package.json b/apps/antd-view/package.json index e48c48b8..9e58fb5e 100644 --- a/apps/antd-view/package.json +++ b/apps/antd-view/package.json @@ -24,8 +24,6 @@ "typecheck": "vue-tsc --noEmit --skipLibCheck" }, "dependencies": { - "@vben-core/design": "workspace:*", - "@vben-core/design-tokens": "workspace:*", "@vben/common-ui": "workspace:*", "@vben/constants": "workspace:*", "@vben/hooks": "workspace:*", @@ -34,6 +32,7 @@ "@vben/locales": "workspace:*", "@vben/preference": "workspace:*", "@vben/stores": "workspace:*", + "@vben/styles": "workspace:*", "@vben/types": "workspace:*", "@vben/utils": "workspace:*", "ant-design-vue": "^4.2.1", diff --git a/apps/antd-view/src/layout.vue b/apps/antd-view/src/layouts/basic.vue similarity index 100% rename from apps/antd-view/src/layout.vue rename to apps/antd-view/src/layouts/basic.vue diff --git a/apps/antd-view/src/router/routes/layout.ts b/apps/antd-view/src/layouts/index.ts similarity index 62% rename from apps/antd-view/src/router/routes/layout.ts rename to apps/antd-view/src/layouts/index.ts index 1733e147..23d79d6e 100644 --- a/apps/antd-view/src/router/routes/layout.ts +++ b/apps/antd-view/src/layouts/index.ts @@ -1,8 +1,8 @@ -const Layout = () => import('@/layout.vue'); +const BasicLayout = () => import('./basic.vue'); const IFrameView = () => import('@vben/layouts').then((m) => m.IFrameView); const AuthPageLayout = () => import('@vben/layouts').then((m) => m.AuthPageLayout); -export { AuthPageLayout, IFrameView, Layout }; +export { AuthPageLayout, BasicLayout, IFrameView }; diff --git a/apps/antd-view/src/main.ts b/apps/antd-view/src/main.ts index bd3cff5f..85ca06f3 100644 --- a/apps/antd-view/src/main.ts +++ b/apps/antd-view/src/main.ts @@ -1,7 +1,4 @@ -import '@vben-core/design/tailwind'; - -import '@vben-core/design'; -import '@vben-core/design-tokens'; +import '@vben/styles'; import { setupI18n } from '@vben/locales'; import { preference, setupPreference } from '@vben/preference'; diff --git a/apps/antd-view/src/router/routes/builtin.ts b/apps/antd-view/src/router/routes/builtin.ts index 6933af1c..f04bbd82 100644 --- a/apps/antd-view/src/router/routes/builtin.ts +++ b/apps/antd-view/src/router/routes/builtin.ts @@ -1,9 +1,8 @@ import type { RouteRecordRaw } from 'vue-router'; +import { AuthPageLayout } from '@/layouts'; import { Fallback } from '@vben/common-ui'; -import { AuthPageLayout } from './layout'; - /** 静态路由列表，访问这些页面可以不需要权限 */ const builtinRoutes: RouteRecordRaw[] = [ { diff --git a/apps/antd-view/src/router/routes/index.ts b/apps/antd-view/src/router/routes/index.ts index 060e244f..0c495802 100644 --- a/apps/antd-view/src/router/routes/index.ts +++ b/apps/antd-view/src/router/routes/index.ts @@ -1,7 +1,8 @@ import type { RouteRecordRaw } from 'vue-router'; +import { BasicLayout } from '@/layouts'; + import { builtinRoutes } from './builtin'; -import { Layout } from './layout'; import { nestedRoutes } from './modules/nested'; import { outsideRoutes } from './modules/outside'; import { vbenRoutes } from './modules/vben'; @@ -10,7 +11,7 @@ import { vbenRoutes } from './modules/vben'; const dynamicRoutes: RouteRecordRaw[] = [ // 根路由 { - component: Layout, + component: BasicLayout, meta: { hideChildrenInMenu: true, title: '首页', diff --git a/apps/antd-view/src/router/routes/modules/nested.ts b/apps/antd-view/src/router/routes/modules/nested.ts index f77405b6..a8ec4b9a 100644 --- a/apps/antd-view/src/router/routes/modules/nested.ts +++ b/apps/antd-view/src/router/routes/modules/nested.ts @@ -1,10 +1,10 @@ import type { RouteRecordRaw } from 'vue-router'; -import { Layout } from '../layout'; +import { BasicLayout } from '@/layouts'; export const nestedRoutes: RouteRecordRaw[] = [ { - component: Layout, + component: BasicLayout, meta: { keepAlive: true, title: '多级菜单', diff --git a/apps/antd-view/src/router/routes/modules/outside.ts b/apps/antd-view/src/router/routes/modules/outside.ts index 6478267e..ad26b466 100644 --- a/apps/antd-view/src/router/routes/modules/outside.ts +++ b/apps/antd-view/src/router/routes/modules/outside.ts @@ -1,10 +1,10 @@ import type { RouteRecordRaw } from 'vue-router'; -import { IFrameView, Layout } from '../layout'; +import { BasicLayout, IFrameView } from '@/layouts'; export const outsideRoutes: RouteRecordRaw[] = [ { - component: Layout, + component: BasicLayout, meta: { title: '外部页面', }, diff --git a/apps/antd-view/src/router/routes/modules/vben.ts b/apps/antd-view/src/router/routes/modules/vben.ts index 0bbeb6a6..3836fa44 100644 --- a/apps/antd-view/src/router/routes/modules/vben.ts +++ b/apps/antd-view/src/router/routes/modules/vben.ts @@ -1,14 +1,13 @@ import type { RouteRecordRaw } from 'vue-router'; +import { BasicLayout, IFrameView } from '@/layouts'; import { VBEN_GITHUB_URL } from '@vben/constants'; import { $t } from '@vben/locales/helper'; import { preference } from '@vben/preference'; -import { IFrameView, Layout } from '@/router/routes/layout'; - export const vbenRoutes: RouteRecordRaw[] = [ { - component: Layout, + component: BasicLayout, meta: { icon: preference.logo, title: 'Vben Admin', diff --git a/apps/antd-view/vite.config.mts b/apps/antd-view/vite.config.mts index 783296bb..c0632051 100644 --- a/apps/antd-view/vite.config.mts +++ b/apps/antd-view/vite.config.mts @@ -18,7 +18,7 @@ export default defineConfig({ { name: 'vue-demi' }, ], }, - visualizer: false, + visualizer: true, }, vite: { server: { diff --git a/packages/@vben-core/shared/design/src/scss/common/base.scss b/packages/@vben-core/shared/design/src/scss/common/base.scss index 4998c113..9b2b2165 100644 --- a/packages/@vben-core/shared/design/src/scss/common/base.scss +++ b/packages/@vben-core/shared/design/src/scss/common/base.scss @@ -77,13 +77,6 @@ textarea::placeholder { opacity: 1; } -// .collapse-transition { -// transition: -// height 0.2s ease-in-out, -// padding-top 0.2s ease-in-out, -// padding-bottom 0.2s ease-in-out; -// } - input:-webkit-autofill { border: none; box-shadow: 0 0 0 1000px transparent inset; diff --git a/packages/@vben-core/shared/toolkit/src/window.test.ts b/packages/@vben-core/shared/toolkit/src/window.test.ts index b9b7223c..8152dcb2 100644 --- a/packages/@vben-core/shared/toolkit/src/window.test.ts +++ b/packages/@vben-core/shared/toolkit/src/window.test.ts @@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { openWindow } from './window'; // 假设你的函数在 'openWindow' 文件中 -describe('generateUUID', () => { +describe('openWindow', () => { // 保存原始的 window.open 函数 let originalOpen: typeof window.open; diff --git a/packages/business/common-ui/src/authentication/login.vue b/packages/business/common-ui/src/authentication/login.vue index 3c9238cd..8a4bc3e7 100644 --- a/packages/business/common-ui/src/authentication/login.vue +++ b/packages/business/common-ui/src/authentication/login.vue @@ -56,6 +56,7 @@ const passwordStatus = computed(() => { function handleSubmit() { formState.submitted = true; + if ( usernameStatus.value !== 'default' || passwordStatus.value !== 'default' diff --git a/packages/hooks/src/index.ts b/packages/hooks/src/index.ts index 2dad115a..30a58dec 100644 --- a/packages/hooks/src/index.ts +++ b/packages/hooks/src/index.ts @@ -1,3 +1 @@ -// export { useNProgress } from '@vueuse/integrations/useNProgress'; - export * from './use-request'; diff --git a/packages/styles/package.json b/packages/styles/package.json new file mode 100644 index 00000000..4e005770 --- /dev/null +++ b/packages/styles/package.json @@ -0,0 +1,49 @@ +{ + "name": "@vben/styles", + "version": "1.0.0", + "type": "module", + "license": "MIT", + "homepage": "https://github.com/vbenjs/vue-vben-admin", + "repository": { + "type": "git", + "url": "git+https://github.com/vbenjs/vue-vben-admin.git", + "directory": "packages/styles" + }, + "bugs": { + "url": "https://github.com/vbenjs/vue-vben-admin/issues" + }, + "scripts": { + "build": "pnpm vite build", + "prepublishOnly": "npm run build" + }, + "files": [ + "dist" + ], + "sideEffects": [ + "**/*.css" + ], + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "imports": { + "#*": "./src/*" + }, + "exports": { + ".": { + "development": "./src/index.ts", + "types": "./src/index.ts", + "default": "./dist/index.mjs" + } + }, + "publishConfig": { + "exports": { + ".": { + "types": "./dist/index.d.ts", + "default": "./dist/index.mjs" + } + } + }, + "dependencies": { + "@vben-core/design": "workspace:*", + "@vben-core/design-tokens": "workspace:*" + } +} diff --git a/packages/styles/src/index.ts b/packages/styles/src/index.ts new file mode 100644 index 00000000..a6b601fb --- /dev/null +++ b/packages/styles/src/index.ts @@ -0,0 +1,4 @@ +import '@vben-core/design/tailwind'; + +import '@vben-core/design'; +import '@vben-core/design-tokens'; diff --git a/packages/styles/tsconfig.json b/packages/styles/tsconfig.json new file mode 100644 index 00000000..b7594e8b --- /dev/null +++ b/packages/styles/tsconfig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "extends": "@vben/tsconfig/web.json", + "include": ["src"] +} diff --git a/packages/styles/vite.config.mts b/packages/styles/vite.config.mts new file mode 100644 index 00000000..9a5f448e --- /dev/null +++ b/packages/styles/vite.config.mts @@ -0,0 +1,3 @@ +import { defineConfig } from '@vben/vite-config'; + +export default defineConfig(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea34b862..e62060c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,12 +93,6 @@ importers: apps/antd-view: dependencies: - '@vben-core/design': - specifier: workspace:* - version: link:../../packages/@vben-core/shared/design - '@vben-core/design-tokens': - specifier: workspace:* - version: link:../../packages/@vben-core/shared/design-tokens '@vben/common-ui': specifier: workspace:* version: link:../../packages/business/common-ui @@ -123,6 +117,9 @@ importers: '@vben/stores': specifier: workspace:* version: link:../../packages/stores + '@vben/styles': + specifier: workspace:* + version: link:../../packages/styles '@vben/types': specifier: workspace:* version: link:../../packages/types @@ -748,6 +745,15 @@ importers: specifier: ^4.3.2 version: 4.3.2(vue@3.4.27(typescript@5.4.5)) + packages/styles: + dependencies: + '@vben-core/design': + specifier: workspace:* + version: link:../@vben-core/shared/design + '@vben-core/design-tokens': + specifier: workspace:* + version: link:../@vben-core/shared/design-tokens + packages/types: dependencies: '@vben-core/typings': diff --git a/vben-admin.code-workspace b/vben-admin.code-workspace index 51537d25..a4c783f7 100644 --- a/vben-admin.code-workspace +++ b/vben-admin.code-workspace @@ -108,6 +108,10 @@ "name": "@vben/stores", "path": "packages/stores", }, + { + "name": "@vben/styles", + "path": "packages/styles", + }, { "name": "@vben/types", "path": "packages/types",