diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 9b5e9e42..38e695a1 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -35,9 +35,9 @@ "@vben/icons": "workspace:*", "@vben/layouts": "workspace:*", "@vben/locales": "workspace:*", - "@vben/universal-ui": "workspace:*", "@vben/styles": "workspace:*", "@vben/types": "workspace:*", + "@vben/universal-ui": "workspace:*", "@vben/utils": "workspace:*", "@vben/widgets": "workspace:*", "@vueuse/core": "^10.11.0", diff --git a/apps/web-antd/src/views/_essential/vben/about/index.vue b/apps/web-antd/src/views/_essential/vben/about/index.vue index cf24d69a..66e3825b 100644 --- a/apps/web-antd/src/views/_essential/vben/about/index.vue +++ b/apps/web-antd/src/views/_essential/vben/about/index.vue @@ -1,9 +1,9 @@ diff --git a/cspell.json b/cspell.json index bee88895..bc0cf9be 100644 --- a/cspell.json +++ b/cspell.json @@ -22,7 +22,6 @@ "qrcode", "shadcn", "sonner", - "ui-kit", "unplugin", "vben", "vueuse", @@ -35,7 +34,9 @@ "nocheck", "prefixs", "vitepress", - "ependencies" + "ependencies", + "vite", + "echarts" ], "ignorePaths": ["**/node_modules/**", "**/dist/**", "**/iconify/**"] } diff --git a/internal/node-utils/src/date.ts b/internal/node-utils/src/date.ts index 6cc02745..d36572d9 100644 --- a/internal/node-utils/src/date.ts +++ b/internal/node-utils/src/date.ts @@ -5,6 +5,8 @@ import utc from 'dayjs/plugin/utc'; dayjs.extend(utc); dayjs.extend(timezone); -const dateUtil = dayjs().tz('Asia/Shanghai'); +dayjs.tz.setDefault('Asia/Shanghai'); + +const dateUtil = dayjs; export { dateUtil }; diff --git a/internal/node-utils/src/index.ts b/internal/node-utils/src/index.ts index 73f603d8..00c501b6 100644 --- a/internal/node-utils/src/index.ts +++ b/internal/node-utils/src/index.ts @@ -9,6 +9,6 @@ export { prettierFormat } from './prettier'; export type { Package } from '@manypkg/get-packages'; export { consola } from 'consola'; export { nanoid } from 'nanoid'; -export { readPackageJSON } from 'pkg-types'; +export { type PackageJson, readPackageJSON } from 'pkg-types'; export { rimraf } from 'rimraf'; export { $, chalk as colors, fs, spinner } from 'zx'; diff --git a/internal/tsconfig/web.json b/internal/tsconfig/web.json index a4b60cec..a0f74e19 100644 --- a/internal/tsconfig/web.json +++ b/internal/tsconfig/web.json @@ -8,7 +8,7 @@ "lib": ["ESNext", "DOM", "DOM.Iterable"], "useDefineForClassFields": true, "moduleResolution": "bundler", - "types": ["vite/client"], + "types": ["vite/client", "@vben/types/window"], "declaration": false } } diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index 88ccfa2b..eb0f8670 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -24,6 +24,7 @@ function defineApplicationConfig(options: DefineApplicationOptions = {}) { html: true, i18n: true, injectAppLoading: true, + injectMetadata: true, isBuild, license: true, mock: true, diff --git a/internal/vite-config/src/config/library.ts b/internal/vite-config/src/config/library.ts index 2d1c3504..b86f215a 100644 --- a/internal/vite-config/src/config/library.ts +++ b/internal/vite-config/src/config/library.ts @@ -19,6 +19,7 @@ function defineLibraryConfig(options: DefineLibraryOptions = {}) { const plugins = await getLibraryConditionPlugins({ dts: false, injectLibCss: true, + injectMetadata: true, isBuild, mode, ...(typeof library === 'function' ? library(config) : library), diff --git a/internal/vite-config/src/plugins/index.ts b/internal/vite-config/src/plugins/index.ts index 50338035..37d2aa17 100644 --- a/internal/vite-config/src/plugins/index.ts +++ b/internal/vite-config/src/plugins/index.ts @@ -27,6 +27,7 @@ import viteVueDevTools from 'vite-plugin-vue-devtools'; import { viteExtraAppConfigPlugin } from './extra-app-config'; import { viteImportMapPlugin } from './importmap'; import { viteInjectAppLoadingPlugin } from './inject-app-loading'; +import { viteMetadataPlugin } from './inject-metadata'; import { viteLicensePlugin } from './license'; /** @@ -52,7 +53,7 @@ async function getConditionEstablishedPlugins( async function getCommonConditionPlugins( options: CommonPluginOptions, ): Promise { - const { devtools, isBuild, visualizer } = options; + const { devtools, injectMetadata, isBuild, visualizer } = options; return [ { condition: true, @@ -66,10 +67,15 @@ async function getCommonConditionPlugins( viteVueJsx(), ], }, + { condition: !isBuild && devtools, plugins: () => [viteVueDevTools()], }, + { + condition: injectMetadata, + plugins: async () => [await viteMetadataPlugin()], + }, { condition: isBuild && !!visualizer, plugins: () => [viteVisualizerPlugin({ diff --git a/internal/vite-config/src/plugins/inject-metadata.ts b/internal/vite-config/src/plugins/inject-metadata.ts new file mode 100644 index 00000000..0f34d2fc --- /dev/null +++ b/internal/vite-config/src/plugins/inject-metadata.ts @@ -0,0 +1,87 @@ +import type { PluginOption } from 'vite'; + +import { dateUtil, getPackages, readPackageJSON } from '@vben/node-utils'; + +function resolvePackageVersion( + pkgsMeta: Record, + name: string, + value: string, +) { + if (value.includes('workspace')) { + return pkgsMeta[name]; + } + return value; +} + +async function resolveMonorepoDependencies() { + const { packages } = await getPackages(); + const resultDevDependencies: Record = {}; + const resultDependencies: Record = {}; + const pkgsMeta: Record = {}; + + for (const { packageJson } of packages) { + pkgsMeta[packageJson.name] = packageJson.version; + } + + for (const { packageJson } of packages) { + const { dependencies = {}, devDependencies = {} } = packageJson; + for (const [key, value] of Object.entries(dependencies)) { + resultDependencies[key] = resolvePackageVersion(pkgsMeta, key, value); + } + for (const [key, value] of Object.entries(devDependencies)) { + resultDevDependencies[key] = resolvePackageVersion(pkgsMeta, key, value); + } + } + return { + dependencies: resultDependencies, + devDependencies: resultDevDependencies, + }; +} + +/** + * 用于注入项目信息 + */ +async function viteMetadataPlugin( + root = process.cwd(), +): Promise { + const { author, description, homepage, license, repository, version } = + await readPackageJSON(root); + + const buildTime = dateUtil().format('YYYY-MM-DD HH:mm:ss'); + + return { + async config() { + const { dependencies, devDependencies } = + await resolveMonorepoDependencies(); + const repositoryUrl = + typeof repository === 'object' ? repository.url : repository; + + const isAuthorObject = typeof author === 'object'; + const authorName = isAuthorObject ? author.name : author; + const authorEmail = isAuthorObject ? author.email : null; + const authorUrl = isAuthorObject ? author.url : null; + + return { + define: { + __VBEN_ADMIN_METADATA__: JSON.stringify({ + authorEmail, + authorName, + authorUrl, + buildTime, + dependencies, + description, + devDependencies, + homepage, + license, + repositoryUrl, + version, + }), + }, + }; + }, + enforce: 'post', + name: 'vite:inject-metadata', + }; +} + +export { viteMetadataPlugin }; diff --git a/internal/vite-config/src/plugins/license.ts b/internal/vite-config/src/plugins/license.ts index eefef290..5be9b2e0 100644 --- a/internal/vite-config/src/plugins/license.ts +++ b/internal/vite-config/src/plugins/license.ts @@ -10,7 +10,7 @@ import { EOL } from 'node:os'; import { dateUtil, readPackageJSON } from '@vben/node-utils'; /** - * 用于将配置文件抽离出来并注入到项目中 + * 用于注入版权信息 * @returns */ @@ -28,8 +28,7 @@ async function viteLicensePlugin( enforce: 'post', generateBundle: { handler: (_options: NormalizedOutputOptions, bundle: OutputBundle) => { - const date = dateUtil.format('YYYY-MM-DD '); - + const date = dateUtil().format('YYYY-MM-DD '); const copyrightText = `/*! * Vben Admin Pro * Version: ${version} diff --git a/internal/vite-config/src/typing.ts b/internal/vite-config/src/typing.ts index 064a952e..89e4d58e 100644 --- a/internal/vite-config/src/typing.ts +++ b/internal/vite-config/src/typing.ts @@ -42,6 +42,8 @@ interface CommonPluginOptions { devtools?: boolean; /** 环境变量 */ env?: Record; + /** 是否开启注入metadata */ + injectMetadata: boolean; /** 是否构建模式 */ isBuild?: boolean; /** 构建模式 */ diff --git a/packages/@core/shared/design-tokens/src/dark/index.css b/packages/@core/shared/design-tokens/src/dark/index.css index 4997f01c..d3352b8f 100644 --- a/packages/@core/shared/design-tokens/src/dark/index.css +++ b/packages/@core/shared/design-tokens/src/dark/index.css @@ -6,7 +6,9 @@ --foreground: 220 13% 91%; /* Background color for */ - --card: 222.2 84% 4.9%; + --card: 222.86deg 8.43% 16.27%; + + /* --card: 222.2 84% 4.9%; */ --card-foreground: 210 40% 98%; /* Background color for popovers such as , , */ diff --git a/packages/@core/shared/design/src/scss/common/base.scss b/packages/@core/shared/design/src/scss/common/base.scss index 3cdac23a..36fea24c 100644 --- a/packages/@core/shared/design/src/scss/common/base.scss +++ b/packages/@core/shared/design/src/scss/common/base.scss @@ -46,7 +46,7 @@ a:active, a:hover, a:link, a:visited { - color: inherit; + // color: inherit; text-decoration: none; } diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/index.ts index 06fd31cd..a7ca8509 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/index.ts +++ b/packages/@core/ui-kit/shadcn-ui/src/components/index.ts @@ -13,10 +13,12 @@ export * from './hover-card'; export * from './icon'; export * from './input'; export * from './input-password'; +export * from './link'; export * from './logo'; export * from './menu-badge'; export * from './pin-input'; export * from './popover'; +export * from './render-content'; export * from './scrollbar'; export * from './segmented'; export * from './sheet'; @@ -27,6 +29,7 @@ export * from './ui/avatar'; export * from './ui/badge'; export * from './ui/breadcrumb'; export * from './ui/button'; +export * from './ui/card'; export * from './ui/checkbox'; export * from './ui/dialog'; export * from './ui/dropdown-menu'; diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/link/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/link/index.ts new file mode 100644 index 00000000..438a557b --- /dev/null +++ b/packages/@core/ui-kit/shadcn-ui/src/components/link/index.ts @@ -0,0 +1 @@ +export { default as VbenLink } from './link.vue'; diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/link/link.vue b/packages/@core/ui-kit/shadcn-ui/src/components/link/link.vue new file mode 100644 index 00000000..f044ee7c --- /dev/null +++ b/packages/@core/ui-kit/shadcn-ui/src/components/link/link.vue @@ -0,0 +1,30 @@ + + + diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/render-content/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/render-content/index.ts new file mode 100644 index 00000000..788c8af6 --- /dev/null +++ b/packages/@core/ui-kit/shadcn-ui/src/components/render-content/index.ts @@ -0,0 +1 @@ +export { default as VbenRenderContent } from './render-content.vue'; diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue b/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue new file mode 100644 index 00000000..4fe93bab --- /dev/null +++ b/packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue @@ -0,0 +1,23 @@ + + + diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/spinner/spinner.vue b/packages/@core/ui-kit/shadcn-ui/src/components/spinner/spinner.vue index 21dac585..318945c2 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/spinner/spinner.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/spinner/spinner.vue @@ -61,7 +61,7 @@ function onTransitionEnd() { :class="{ 'invisible opacity-0': !showSpinner, }" - class="flex-center bg-overlay absolute left-0 top-0 size-full backdrop-blur-sm transition-all duration-500" + class="flex-center bg-overlay z-100 absolute left-0 top-0 size-full backdrop-blur-sm transition-all duration-500" @transitionend="onTransitionEnd" >
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardHeader.vue b/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardHeader.vue index 484acb15..6c98dfa5 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardHeader.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/card/CardHeader.vue @@ -9,7 +9,7 @@ const props = defineProps<{ diff --git a/packages/business/universal-ui/src/about/about.ts b/packages/business/universal-ui/src/about/about.ts new file mode 100644 index 00000000..c4cf9579 --- /dev/null +++ b/packages/business/universal-ui/src/about/about.ts @@ -0,0 +1,14 @@ +import type { Component } from 'vue'; + +interface AboutProps { + description?: string; + name?: string; + title?: string; +} + +interface DescriptionItem { + content: Component | string; + title: string; +} + +export type { AboutProps, DescriptionItem }; diff --git a/packages/business/universal-ui/src/about/about.vue b/packages/business/universal-ui/src/about/about.vue new file mode 100644 index 00000000..51c4dfd8 --- /dev/null +++ b/packages/business/universal-ui/src/about/about.vue @@ -0,0 +1,176 @@ + + + diff --git a/packages/business/universal-ui/src/about/index.ts b/packages/business/universal-ui/src/about/index.ts new file mode 100644 index 00000000..5860f5b9 --- /dev/null +++ b/packages/business/universal-ui/src/about/index.ts @@ -0,0 +1 @@ +export { default as About } from './about.vue'; diff --git a/packages/business/universal-ui/src/index.ts b/packages/business/universal-ui/src/index.ts index b35ffe66..fb99fdec 100644 --- a/packages/business/universal-ui/src/index.ts +++ b/packages/business/universal-ui/src/index.ts @@ -1,3 +1,4 @@ +export * from './about'; export * from './authentication'; export * from './dashboard'; export * from './fallback'; diff --git a/packages/types/package.json b/packages/types/package.json index 6fecca07..c67cc383 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -28,6 +28,9 @@ }, "./global": { "types": "./global.d.ts" + }, + "./window": { + "types": "./window.d.ts" } }, "publishConfig": { diff --git a/packages/types/window.d.ts b/packages/types/window.d.ts new file mode 100644 index 00000000..324a41dc --- /dev/null +++ b/packages/types/window.d.ts @@ -0,0 +1,19 @@ +export {}; + +declare global { + interface Window { + __VBEN_ADMIN_METADATA__: { + authorEmail: string; + authorName: string; + authorUrl: string; + buildTime: string; + dependencies: Record; + description: string; + devDependencies: Record; + homepage: string; + license: string; + repositoryUrl: string; + version: string; + }; + } +}