diff --git a/.ls-lint.yml b/.ls-lint.yml deleted file mode 100644 index 7f8b7ce6..00000000 --- a/.ls-lint.yml +++ /dev/null @@ -1,28 +0,0 @@ -ls: - .js: kebab-case | pointcase - .vue: kebab-case | pointcase - .ts: kebab-case | pointcase - .tsx: kebab-case | pointcase - .jsx: kebab-case | pointcase - .css: kebab-case | pointcase - .d.ts: kebab-case | pointcase - # shadcn 自动生成文件为 PascalCase 格式 - packages/@core/ui-kit/shadcn-ui/src/components/ui: - .vue: PascalCase - -ignore: - - "**/*.png" - - "**/*.jpg" - - "**/*.jpeg" - - "**/*.jpeg" - - "**/*.gif" - - "**/_util.ts" - - "**/deps/**" - - "**/dist/**" - - "**/node_modules/**" - - "**/.turbo/**" - - .git - - .vscode - - .idea - - node_modules - - .cache diff --git a/.vscode/settings.json b/.vscode/settings.json index 6adbc86b..8d76b74e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -213,7 +213,7 @@ "README.md": "README*,CHANGELOG*,LICENSE,CNAME", "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,.gitattributes,.gitignore,.gitpod.yml,.npmrc,.browserslistrc,.node-version,.git*,.tazerc.json", "Dockerfile": "Dockerfile,.docker*,docker-entrypoint.sh,build-local-docker*,nginx.conf", - "eslint.config.mjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,stylelint.config.*,.lintstagedrc.mjs,.ls-lint*,cspell.json", + "eslint.config.mjs": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.*,.prettierrc.*,stylelint.config.*,.lintstagedrc.mjs,cspell.json", "tailwind.config.mjs": "postcss.*" }, "commentTranslate.hover.enabled": false, diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 44de7b7b..94285e31 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-antd", - "version": "5.2.0", + "version": "5.2.1", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-antd/src/layouts/auth.vue b/apps/web-antd/src/layouts/auth.vue new file mode 100644 index 00000000..18d415bc --- /dev/null +++ b/apps/web-antd/src/layouts/auth.vue @@ -0,0 +1,23 @@ + + + diff --git a/apps/web-antd/src/layouts/index.ts b/apps/web-antd/src/layouts/index.ts index 23d79d6e..a4320780 100644 --- a/apps/web-antd/src/layouts/index.ts +++ b/apps/web-antd/src/layouts/index.ts @@ -1,8 +1,6 @@ const BasicLayout = () => import('./basic.vue'); +const AuthPageLayout = () => import('./auth.vue'); const IFrameView = () => import('@vben/layouts').then((m) => m.IFrameView); -const AuthPageLayout = () => - import('@vben/layouts').then((m) => m.AuthPageLayout); - export { AuthPageLayout, BasicLayout, IFrameView }; diff --git a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue index 35e90276..fadfc917 100644 --- a/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue +++ b/apps/web-antd/src/views/dashboard/analytics/analytics-trends.vue @@ -55,12 +55,27 @@ onMounted(() => { }, trigger: 'axis', }, + // xAxis: { + // axisTick: { + // show: false, + // }, + // boundaryGap: false, + // data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`), + // type: 'category', + // }, xAxis: { axisTick: { show: false, }, boundaryGap: false, data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`), + splitLine: { + lineStyle: { + type: 'solid', + width: 1, + }, + show: true, + }, type: 'category', }, yAxis: [ @@ -69,7 +84,10 @@ onMounted(() => { show: false, }, max: 80_000, - + splitArea: { + show: true, + }, + splitNumber: 4, type: 'value', }, ], diff --git a/apps/web-antd/src/views/demos/antd/index.vue b/apps/web-antd/src/views/demos/antd/index.vue index 8286bebb..b3b05cc1 100644 --- a/apps/web-antd/src/views/demos/antd/index.vue +++ b/apps/web-antd/src/views/demos/antd/index.vue @@ -37,7 +37,7 @@ function notify(type: NotificationType) { description="支持多语言，主题功能集成切换等" title="Ant Design Vue组件使用演示" > - + diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json index 4158d6d9..5208b485 100644 --- a/apps/web-ele/package.json +++ b/apps/web-ele/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-ele", - "version": "5.2.0", + "version": "5.2.1", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-ele/src/layouts/auth.vue b/apps/web-ele/src/layouts/auth.vue new file mode 100644 index 00000000..18d415bc --- /dev/null +++ b/apps/web-ele/src/layouts/auth.vue @@ -0,0 +1,23 @@ + + + diff --git a/apps/web-ele/src/layouts/index.ts b/apps/web-ele/src/layouts/index.ts index 23d79d6e..a4320780 100644 --- a/apps/web-ele/src/layouts/index.ts +++ b/apps/web-ele/src/layouts/index.ts @@ -1,8 +1,6 @@ const BasicLayout = () => import('./basic.vue'); +const AuthPageLayout = () => import('./auth.vue'); const IFrameView = () => import('@vben/layouts').then((m) => m.IFrameView); -const AuthPageLayout = () => - import('@vben/layouts').then((m) => m.AuthPageLayout); - export { AuthPageLayout, BasicLayout, IFrameView }; diff --git a/apps/web-ele/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-ele/src/views/dashboard/analytics/analytics-trends.vue index 35e90276..fadfc917 100644 --- a/apps/web-ele/src/views/dashboard/analytics/analytics-trends.vue +++ b/apps/web-ele/src/views/dashboard/analytics/analytics-trends.vue @@ -55,12 +55,27 @@ onMounted(() => { }, trigger: 'axis', }, + // xAxis: { + // axisTick: { + // show: false, + // }, + // boundaryGap: false, + // data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`), + // type: 'category', + // }, xAxis: { axisTick: { show: false, }, boundaryGap: false, data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`), + splitLine: { + lineStyle: { + type: 'solid', + width: 1, + }, + show: true, + }, type: 'category', }, yAxis: [ @@ -69,7 +84,10 @@ onMounted(() => { show: false, }, max: 80_000, - + splitArea: { + show: true, + }, + splitNumber: 4, type: 'value', }, ], diff --git a/apps/web-ele/src/views/dashboard/workspace/index.vue b/apps/web-ele/src/views/dashboard/workspace/index.vue index c8ae0273..b84ceebb 100644 --- a/apps/web-ele/src/views/dashboard/workspace/index.vue +++ b/apps/web-ele/src/views/dashboard/workspace/index.vue @@ -214,7 +214,11 @@ const trendItems: WorkbenchTrendItem[] = [
- + diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json index d26faf4b..29b67318 100644 --- a/apps/web-naive/package.json +++ b/apps/web-naive/package.json @@ -1,6 +1,6 @@ { "name": "@vben/web-naive", - "version": "5.2.0", + "version": "5.2.1", "homepage": "https://vben.pro", "bugs": "https://github.com/vbenjs/vue-vben-admin/issues", "repository": { diff --git a/apps/web-naive/src/layouts/auth.vue b/apps/web-naive/src/layouts/auth.vue new file mode 100644 index 00000000..18d415bc --- /dev/null +++ b/apps/web-naive/src/layouts/auth.vue @@ -0,0 +1,23 @@ + + + diff --git a/apps/web-naive/src/layouts/index.ts b/apps/web-naive/src/layouts/index.ts index 23d79d6e..a4320780 100644 --- a/apps/web-naive/src/layouts/index.ts +++ b/apps/web-naive/src/layouts/index.ts @@ -1,8 +1,6 @@ const BasicLayout = () => import('./basic.vue'); +const AuthPageLayout = () => import('./auth.vue'); const IFrameView = () => import('@vben/layouts').then((m) => m.IFrameView); -const AuthPageLayout = () => - import('@vben/layouts').then((m) => m.AuthPageLayout); - export { AuthPageLayout, BasicLayout, IFrameView }; diff --git a/apps/web-naive/src/views/dashboard/analytics/analytics-trends.vue b/apps/web-naive/src/views/dashboard/analytics/analytics-trends.vue index 35e90276..fadfc917 100644 --- a/apps/web-naive/src/views/dashboard/analytics/analytics-trends.vue +++ b/apps/web-naive/src/views/dashboard/analytics/analytics-trends.vue @@ -55,12 +55,27 @@ onMounted(() => { }, trigger: 'axis', }, + // xAxis: { + // axisTick: { + // show: false, + // }, + // boundaryGap: false, + // data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`), + // type: 'category', + // }, xAxis: { axisTick: { show: false, }, boundaryGap: false, data: Array.from({ length: 18 }).map((_item, index) => `${index + 6}:00`), + splitLine: { + lineStyle: { + type: 'solid', + width: 1, + }, + show: true, + }, type: 'category', }, yAxis: [ @@ -69,7 +84,10 @@ onMounted(() => { show: false, }, max: 80_000, - + splitArea: { + show: true, + }, + splitNumber: 4, type: 'value', }, ], diff --git a/apps/web-naive/src/views/dashboard/workspace/index.vue b/apps/web-naive/src/views/dashboard/workspace/index.vue index c8ae0273..b84ceebb 100644 --- a/apps/web-naive/src/views/dashboard/workspace/index.vue +++ b/apps/web-naive/src/views/dashboard/workspace/index.vue @@ -214,7 +214,11 @@ const trendItems: WorkbenchTrendItem[] = [
- + diff --git a/docs/package.json b/docs/package.json index cea7b8cd..2835b802 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@vben/docs", - "version": "5.2.0", + "version": "5.2.1", "private": true, "scripts": { "build": "vitepress build", diff --git a/docs/src/en/guide/essentials/settings.md b/docs/src/en/guide/essentials/settings.md index 7fc2c399..5a9eb5c4 100644 --- a/docs/src/en/guide/essentials/settings.md +++ b/docs/src/en/guide/essentials/settings.md @@ -240,7 +240,7 @@ const defaultPreferences: Preferences = { theme: { builtinType: 'default', colorDestructive: 'hsl(348 100% 61%)', - colorPrimary: 'hsl(231 98% 65%)', + colorPrimary: 'hsl(212 100% 45%)', colorSuccess: 'hsl(144 57% 58%)', colorWarning: 'hsl(42 84% 61%)', mode: 'dark', diff --git a/docs/src/en/guide/in-depth/login.md b/docs/src/en/guide/in-depth/login.md index 207e9497..ac57a320 100644 --- a/docs/src/en/guide/in-depth/login.md +++ b/docs/src/en/guide/in-depth/login.md @@ -18,7 +18,7 @@ You just need to configure the `props` parameter of `AuthPageLayout` in `src/rou pageTitle: "开箱即用的大型中后台管理系统", pageDescription: "工程化、高性能、跨组件库的前端模版", toolbar: true, - toolbarList: () => ['color', 'language', 'layout', 'theme'], + toolbarList: ['color', 'language', 'layout', 'theme'], } // ... }, diff --git a/docs/src/en/guide/in-depth/theme.md b/docs/src/en/guide/in-depth/theme.md index 95a9e478..11c9c992 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: 231 98% 65%; + --primary: 212 100% 45%; --primary-foreground: 0 0% 98%; /* Used for destructive actions such as