diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs index 3deda6c2..e68d8a3e 100644 --- a/.lintstagedrc.mjs +++ b/.lintstagedrc.mjs @@ -1,7 +1,4 @@ export default { - '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': [ - 'prettier --cache --write--parser json', - ], '*.{js,jsx,ts,tsx}': [ 'prettier --cache --ignore-unknown --write', 'eslint --cache --fix', @@ -16,5 +13,8 @@ export default { 'eslint --cache --fix', 'stylelint --fix --allow-empty-input', ], + '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': [ + 'prettier --cache --write--parser json', + ], 'package.json': ['prettier --cache --write'], }; diff --git a/apps/web-antd/.env.production b/apps/web-antd/.env.production index 0425eada..e98aade8 100644 --- a/apps/web-antd/.env.production +++ b/apps/web-antd/.env.production @@ -12,6 +12,9 @@ VITE_ROUTER_HISTORY=history # 是否注入全局loading VITE_INJECT_APP_LOADING=true +# 打包后是否生成dist.zip +VITE_ARCHIVER=true + # 后台请求路径 具体在vite.config.mts配置代理 VITE_GLOB_API_URL=/prod-api @@ -26,3 +29,4 @@ VITE_GLOB_APP_CLIENT_ID=6afcaa29272b14c1c87264950c726ef4 # 开启WEBSOCKET VITE_GLOB_WEBSOCKET_ENABLE=false + diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index eb7261d9..44de7b7b 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-antd", - "version": "5.1.2", + "version": "5.2.0", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-ele/.env.production b/apps/web-ele/.env.production index 37947069..5375847a 100644 --- a/apps/web-ele/.env.production +++ b/apps/web-ele/.env.production @@ -14,3 +14,6 @@ VITE_ROUTER_HISTORY=hash # 是否注入全局loading VITE_INJECT_APP_LOADING=true + +# 打包后是否生成dist.zip +VITE_ARCHIVER=true diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index fa70273b..4158d6d9 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-ele", - "version": "5.1.2", + "version": "5.2.0", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-naive/.env.production b/apps/web-naive/.env.production index 37947069..5375847a 100644 --- a/apps/web-naive/.env.production +++ b/apps/web-naive/.env.production @@ -14,3 +14,6 @@ VITE_ROUTER_HISTORY=hash # 是否注入全局loading VITE_INJECT_APP_LOADING=true + +# 打包后是否生成dist.zip +VITE_ARCHIVER=true diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index 82a3902d..d26faf4b 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-naive", - "version": "5.1.2", + "version": "5.2.0", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/docs/.vitepress/config/shared.mts b/docs/.vitepress/config/shared.mts index b7059f32..43ce9ffa 100644 --- a/docs/.vitepress/config/shared.mts +++ b/docs/.vitepress/config/shared.mts @@ -3,6 +3,8 @@ import type { HeadConfig } from 'vitepress'; import { resolve } from 'node:path'; +import { viteArchiverPlugin } from '@vben/vite-config'; + import { GitChangelog, GitChangelogMarkdownSection, @@ -76,6 +78,7 @@ export const shared = defineConfig({ repoURL: () => 'https://github.com/vbenjs/vue-vben-admin', }), GitChangelogMarkdownSection(), + viteArchiverPlugin({ outputDir: '.vitepress' }), ], server: { fs: { diff --git a/docs/package.json b/docs/package.json index e265455f..cea7b8cd 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@vben/docs", - "version": "5.1.2", + "version": "5.2.0", "private": true, "scripts": { "build": "vitepress build", @@ -11,15 +11,13 @@ "@vben-core/shadcn-ui": "workspace:*", "@vben/common-ui": "workspace:*", "@vben/styles": "workspace:*", - "@vueuse/core": "^11.0.3", "lucide-vue-next": "^0.436.0", - "markdown-it": "^14.1.0", "medium-zoom": "^1.1.0", "radix-vue": "^1.9.5" }, "devDependencies": { "@nolebase/vitepress-plugin-git-changelog": "^2.4.0", - "@types/markdown-it": "^14.1.2", + "@vben/vite-config": "workspace:*", "@vite-pwa/vitepress": "^0.5.0", "vitepress": "^1.3.4", "vue": "^3.4.38" diff --git a/docs/src/components/common-ui/vben-drawer.md b/docs/src/components/common-ui/vben-drawer.md index 1c0f0310..a8df3161 100644 --- a/docs/src/components/common-ui/vben-drawer.md +++ b/docs/src/components/common-ui/vben-drawer.md @@ -58,22 +58,26 @@ const [Drawer, drawerApi] = useVbenDrawer({ 所有属性都可以传入 `useVbenDrawer` 的第一个参数中。 -| 属性名 | 描述 | 类型 | 默认值 | -| ------------------ | ------------------- | --------------- | ------- | -| title | 标题 | `string\|slot` | - | -| titleTooltip | 标题提示信息 | `string\|slot` | - | -| description | 描述信息 | `string\|slot` | - | -| isOpen | 弹窗打开状态 | `boolean` | `false` | -| loading | 弹窗加载状态 | `boolean` | `false` | -| closable | 显示关闭按钮 | `boolean` | `true` | -| modal | 显示遮罩 | `boolean` | `true` | -| header | 显示header | `boolean` | `true` | -| footer | 显示footer | `boolean\|slot` | `true` | -| confirmLoading | 确认按钮loading状态 | `boolean` | `false` | -| closeOnClickModal | 点击遮罩关闭弹窗 | `boolean` | `true` | -| closeOnPressEscape | esc 关闭弹窗 | `boolean` | `true` | -| confirmText | 确认按钮文本 | `boolean\|slot` | `确认` | -| cancelText | 取消按钮文本 | `boolean\|slot` | `取消` | +| 属性名 | 描述 | 类型 | 默认值 | +| --- | --- | --- | --- | +| title | 标题 | `string\|slot` | - | +| titleTooltip | 标题提示信息 | `string\|slot` | - | +| description | 描述信息 | `string\|slot` | - | +| isOpen | 弹窗打开状态 | `boolean` | `false` | +| loading | 弹窗加载状态 | `boolean` | `false` | +| closable | 显示关闭按钮 | `boolean` | `true` | +| modal | 显示遮罩 | `boolean` | `true` | +| header | 显示header | `boolean` | `true` | +| footer | 显示footer | `boolean\|slot` | `true` | +| confirmLoading | 确认按钮loading状态 | `boolean` | `false` | +| closeOnClickModal | 点击遮罩关闭弹窗 | `boolean` | `true` | +| closeOnPressEscape | esc 关闭弹窗 | `boolean` | `true` | +| confirmText | 确认按钮文本 | `string\|slot` | `确认` | +| cancelText | 取消按钮文本 | `string\|slot` | `取消` | +| class | modal的class，宽度通过这个配置 | `string` | - | +| contentClass | modal内容区域的class | `string` | - | +| footerClass | modal底部区域的class | `string` | - | +| headerClass | modal顶部区域的class | `string` | - | ### Event diff --git a/docs/src/components/common-ui/vben-modal.md b/docs/src/components/common-ui/vben-modal.md index f2df3441..a2eecbde 100644 --- a/docs/src/components/common-ui/vben-modal.md +++ b/docs/src/components/common-ui/vben-modal.md @@ -64,26 +64,30 @@ const [Modal, modalApi] = useVbenModal({ 所有属性都可以传入 `useVbenModal` 的第一个参数中。 -| 属性名 | 描述 | 类型 | 默认值 | -| ------------------ | ------------------- | --------------- | ------- | -| title | 标题 | `string\|slot` | - | -| titleTooltip | 标题提示信息 | `string\|slot` | - | -| description | 描述信息 | `string\|slot` | - | -| isOpen | 弹窗打开状态 | `boolean` | `false` | -| loading | 弹窗加载状态 | `boolean` | `false` | -| fullscreen | 全屏显示 | `boolean` | `false` | -| fullscreenButton | 显示全屏按钮 | `boolean` | `true` | -| draggable | 可拖拽 | `boolean` | `false` | -| closable | 显示关闭按钮 | `boolean` | `true` | -| centered | 居中显示 | `boolean` | `false` | -| modal | 显示遮罩 | `boolean` | `true` | -| header | 显示header | `boolean` | `true` | -| footer | 显示footer | `boolean\|slot` | `true` | -| confirmLoading | 确认按钮loading状态 | `boolean` | `false` | -| closeOnClickModal | 点击遮罩关闭弹窗 | `boolean` | `true` | -| closeOnPressEscape | esc 关闭弹窗 | `boolean` | `true` | -| confirmText | 确认按钮文本 | `boolean\|slot` | `确认` | -| cancelText | 取消按钮文本 | `boolean\|slot` | `取消` | +| 属性名 | 描述 | 类型 | 默认值 | +| --- | --- | --- | --- | +| title | 标题 | `string\|slot` | - | +| titleTooltip | 标题提示信息 | `string\|slot` | - | +| description | 描述信息 | `string\|slot` | - | +| isOpen | 弹窗打开状态 | `boolean` | `false` | +| loading | 弹窗加载状态 | `boolean` | `false` | +| fullscreen | 全屏显示 | `boolean` | `false` | +| fullscreenButton | 显示全屏按钮 | `boolean` | `true` | +| draggable | 可拖拽 | `boolean` | `false` | +| closable | 显示关闭按钮 | `boolean` | `true` | +| centered | 居中显示 | `boolean` | `false` | +| modal | 显示遮罩 | `boolean` | `true` | +| header | 显示header | `boolean` | `true` | +| footer | 显示footer | `boolean\|slot` | `true` | +| confirmLoading | 确认按钮loading状态 | `boolean` | `false` | +| closeOnClickModal | 点击遮罩关闭弹窗 | `boolean` | `true` | +| closeOnPressEscape | esc 关闭弹窗 | `boolean` | `true` | +| confirmText | 确认按钮文本 | `string\|slot` | `确认` | +| cancelText | 取消按钮文本 | `string\|slot` | `取消` | +| class | modal的class，宽度通过这个配置 | `string` | - | +| contentClass | modal内容区域的class | `string` | - | +| footerClass | modal底部区域的class | `string` | - | +| headerClass | modal顶部区域的class | `string` | - | ### Event diff --git a/docs/src/en/guide/essentials/settings.md b/docs/src/en/guide/essentials/settings.md index 5a7cec18..7fc2c399 100644 --- a/docs/src/en/guide/essentials/settings.md +++ b/docs/src/en/guide/essentials/settings.md @@ -55,6 +55,9 @@ VITE_DEVTOOLS=true # Whether to inject global loading VITE_INJECT_APP_LOADING=true + +# Whether to generate after packaging dist.zip +VITE_ARCHIVER=true ``` ::: diff --git a/docs/src/en/guide/in-depth/theme.md b/docs/src/en/guide/in-depth/theme.md index 6c2e23b9..6202a13a 100644 --- a/docs/src/en/guide/in-depth/theme.md +++ b/docs/src/en/guide/in-depth/theme.md @@ -53,7 +53,7 @@ You can check the list below to understand all the available variables. /* Theme Colors */ - --primary: 211 91% 39%; + --primary: 231 98% 65%; --primary-foreground: 0 0% 98%; /* Used for destructive actions such as