From 9a6e29c401c6a19242724a9dd37c240789ec3718 Mon Sep 17 00:00:00 2001 From: vben Date: Wed, 31 Jul 2024 22:11:24 +0800 Subject: [PATCH] fix: element theme adjustment --- apps/web-ele/.env | 4 +- apps/web-ele/.env.development | 2 +- apps/web-ele/index.html | 2 +- apps/web-ele/package.json | 2 +- apps/web-ele/src/api/demos/index.ts | 1 - apps/web-ele/src/api/demos/status.ts | 10 --- apps/web-ele/src/api/index.ts | 1 - apps/web-ele/src/bootstrap.ts | 1 - apps/web-ele/src/locales/index.ts | 5 +- apps/web-ele/src/preferences.ts | 3 + .../web-ele/src/views/demos/element/index.vue | 5 +- apps/web-naive/.env.development | 2 +- apps/web-naive/src/bootstrap.ts | 1 - internal/vite-config/package.json | 1 + .../vite-config/src/plugins/nitor-mock.ts | 6 ++ .../design/src/design-tokens/dark/index.css | 2 +- .../src/components/tabs-chrome/tabs.vue | 2 +- .../tabs-ui/src/components/tabs/tabs.vue | 4 +- packages/effects/hooks/package.json | 1 + .../effects/hooks/src/use-design-tokens.ts | 65 ++++++++++++------- pnpm-lock.yaml | 12 ++++ 21 files changed, 80 insertions(+), 52 deletions(-) delete mode 100644 apps/web-ele/src/api/demos/index.ts delete mode 100644 apps/web-ele/src/api/demos/status.ts diff --git a/apps/web-ele/.env b/apps/web-ele/.env index 8933c54bb..87cb3df14 100644 --- a/apps/web-ele/.env +++ b/apps/web-ele/.env @@ -1,5 +1,5 @@ # 应用标题 -VITE_APP_TITLE=Vben Admin +VITE_APP_TITLE=Vben Admin Ele # 应用命名空间，用于缓存、store等功能的前缀，确保隔离 -VITE_APP_NAMESPACE=vben-web-element +VITE_APP_NAMESPACE=vben-web-ele diff --git a/apps/web-ele/.env.development b/apps/web-ele/.env.development index dcf361e73..c138f4829 100644 --- a/apps/web-ele/.env.development +++ b/apps/web-ele/.env.development @@ -1,5 +1,5 @@ # 端口号 -VITE_PORT=5555 +VITE_PORT=5666 VITE_BASE=/ diff --git a/apps/web-ele/index.html b/apps/web-ele/index.html index ca5326990..2b59b8d75 100644 --- a/apps/web-ele/index.html +++ b/apps/web-ele/index.html @@ -21,7 +21,7 @@ (function () { var hm = document.createElement('script'); hm.src = - 'https://hm.baidu.com/hm.js?d20a01273820422b6aa2ee41b6c9414d'; + 'https://hm.baidu.com/hm.js?97352b16ed2df8c3860cf5a1a65fb4dd'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(hm, s); })(); diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index 009d9b784..0ff571b64 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -6,7 +6,7 @@ "repository": { "type": "git", "url": "git+https://github.com/vbenjs/vue-vben-admin.git", - "directory": "apps/web-antd" + "directory": "apps/web-ele" }, "license": "MIT", "author": { diff --git a/apps/web-ele/src/api/demos/index.ts b/apps/web-ele/src/api/demos/index.ts deleted file mode 100644 index 420cc02aa..000000000 --- a/apps/web-ele/src/api/demos/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './status'; diff --git a/apps/web-ele/src/api/demos/status.ts b/apps/web-ele/src/api/demos/status.ts deleted file mode 100644 index daa3d6383..000000000 --- a/apps/web-ele/src/api/demos/status.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { requestClient } from '#/api/request'; - -/** - * 模拟任意状态码 - */ -async function getMockStatus(status: string) { - return requestClient.get('/status', { params: { status } }); -} - -export { getMockStatus }; diff --git a/apps/web-ele/src/api/index.ts b/apps/web-ele/src/api/index.ts index 2b42e898a..4b0e04137 100644 --- a/apps/web-ele/src/api/index.ts +++ b/apps/web-ele/src/api/index.ts @@ -1,2 +1 @@ export * from './core'; -export * from './demos'; diff --git a/apps/web-ele/src/bootstrap.ts b/apps/web-ele/src/bootstrap.ts index 1be9bbe00..6604dec26 100644 --- a/apps/web-ele/src/bootstrap.ts +++ b/apps/web-ele/src/bootstrap.ts @@ -3,7 +3,6 @@ import { createApp } from 'vue'; import { registerAccessDirective } from '@vben/access'; import { initStores } from '@vben/stores'; import '@vben/styles'; -import '@vben/styles/antd'; import { setupI18n } from '#/locales'; diff --git a/apps/web-ele/src/locales/index.ts b/apps/web-ele/src/locales/index.ts index 63651478c..4cf792510 100644 --- a/apps/web-ele/src/locales/index.ts +++ b/apps/web-ele/src/locales/index.ts @@ -8,6 +8,7 @@ import { preferences } from '@vben/preferences'; import dayjs from 'dayjs'; import { Language } from 'element-plus/es/locale'; +import enLocale from 'element-plus/es/locale/lang/en'; import defaultLocale from 'element-plus/es/locale/lang/zh-cn'; const elementLocale = ref(defaultLocale); @@ -71,9 +72,7 @@ async function loadElementLocale(lang: SupportedLanguagesType) { break; } case 'en-US': { - elementLocale.value = (await import( - 'element-plus/es/locale/lang/en' - )) as unknown as Language; + elementLocale.value = enLocale; break; } } diff --git a/apps/web-ele/src/preferences.ts b/apps/web-ele/src/preferences.ts index 9683596a0..63edb3a9b 100644 --- a/apps/web-ele/src/preferences.ts +++ b/apps/web-ele/src/preferences.ts @@ -6,4 +6,7 @@ import { defineOverridesPreferences } from '@vben/preferences'; */ export const overridesPreferences = defineOverridesPreferences({ // overrides + app: { + name: import.meta.env.VITE_APP_TITLE, + }, }); diff --git a/apps/web-ele/src/views/demos/element/index.vue b/apps/web-ele/src/views/demos/element/index.vue index c60979a2f..2ef3d9c59 100644 --- a/apps/web-ele/src/views/demos/element/index.vue +++ b/apps/web-ele/src/views/demos/element/index.vue @@ -10,7 +10,10 @@ import { type NotificationType = 'error' | 'info' | 'success' | 'warning'; function error() { - ElMessage.error('Once upon a time you dressed so fine'); + ElMessage.error({ + duration: 2500, + message: 'Once upon a time you dressed so fine', + }); } function warning() { diff --git a/apps/web-naive/.env.development b/apps/web-naive/.env.development index 9e06fb64a..8bcb432e6 100644 --- a/apps/web-naive/.env.development +++ b/apps/web-naive/.env.development @@ -1,5 +1,5 @@ # 端口号 -VITE_PORT=5566 +VITE_PORT=5777 VITE_BASE=/ diff --git a/apps/web-naive/src/bootstrap.ts b/apps/web-naive/src/bootstrap.ts index 1be9bbe00..6604dec26 100644 --- a/apps/web-naive/src/bootstrap.ts +++ b/apps/web-naive/src/bootstrap.ts @@ -3,7 +3,6 @@ import { createApp } from 'vue'; import { registerAccessDirective } from '@vben/access'; import { initStores } from '@vben/stores'; import '@vben/styles'; -import '@vben/styles/antd'; import { setupI18n } from '#/locales'; diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 6b01b3f40..e88087e5e 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -30,6 +30,7 @@ "@intlify/unplugin-vue-i18n": "^4.0.0", "@jspm/generator": "^2.1.2", "cheerio": "1.0.0-rc.12", + "get-port": "^7.1.0", "html-minifier-terser": "^7.2.0", "nitropack": "^2.9.7", "resolve.exports": "^2.0.2", diff --git a/internal/vite-config/src/plugins/nitor-mock.ts b/internal/vite-config/src/plugins/nitor-mock.ts index dece2c1ee..99e8c06ec 100644 --- a/internal/vite-config/src/plugins/nitor-mock.ts +++ b/internal/vite-config/src/plugins/nitor-mock.ts @@ -4,6 +4,7 @@ import type { NitroMockPluginOptions } from '../typing'; import { colors, consola, getPackage } from '@vben/node-utils'; +import getPort from 'get-port'; import { build, createDevServer, createNitro, prepare } from 'nitropack'; const hmrKeyRe = /^runtimeConfig\.|routeRules\./; @@ -15,6 +16,11 @@ export const viteNitroMockPlugin = ({ }: NitroMockPluginOptions = {}): PluginOption => { return { async configureServer(server) { + const availablePort = await getPort({ port }); + if (availablePort !== port) { + return; + } + const pkg = await getPackage(mockServerPackage); if (!pkg) { consola.error(`Package ${mockServerPackage} not found.`); diff --git a/packages/@core/base/design/src/design-tokens/dark/index.css b/packages/@core/base/design/src/design-tokens/dark/index.css index 6c9e0e530..1dea6978f 100644 --- a/packages/@core/base/design/src/design-tokens/dark/index.css +++ b/packages/@core/base/design/src/design-tokens/dark/index.css @@ -56,7 +56,7 @@ --heavy-foreground: var(--accent-foreground); /* Default border color */ - --border: 240 3.7% 15.9%; + --border: 240 3.7% 22%; /* Border color for inputs such as ,