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-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-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/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