diff --git a/.github/config.yml b/.github/config.yml index 52454840..248da6a5 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -21,12 +21,10 @@ newPRWelcomeComment: | firstPRMergeComment: > Thanks for your contribution! 🎉🎉🎉 - # Comment to be posted to on first time issues newIssueWelcomeComment: > Thanks for opening your first issue! Be sure to follow the issue template and provide every bit of information to help the developers! - # *OPTIONAL* default titles to check against for lack of descriptiveness # MUST BE ALL LOWERCASE requestInfoDefaultTitles: @@ -36,4 +34,3 @@ requestInfoDefaultTitles: # *Required* Comment to reply with requestInfoReplyComment: > Thanks for filing this issue/PR! It would be much appreciated if you could provide us with more information so we can effectively analyze the situation in context. - diff --git a/apps/backend-mock/utils/mock-data.ts b/apps/backend-mock/utils/mock-data.ts index 84c416de..82a50dd6 100644 --- a/apps/backend-mock/utils/mock-data.ts +++ b/apps/backend-mock/utils/mock-data.ts @@ -19,6 +19,7 @@ export const MOCK_USERS: UserInfo[] = [ realName: 'Vben', roles: ['super'], username: 'vben', + homePath: '/dashboard/workspace', }, { id: 1, @@ -194,18 +195,46 @@ export const MOCK_MENUS = [ export const MOCK_MENU_LIST = [ { id: 1, - name: 'Workspace', + name: 'Dashboard', status: 1, - type: 'menu', - icon: 'mdi:dashboard', - path: '/workspace', - component: '/dashboard/workspace/index', + type: 'catalog', + icon: 'lucide:layout-dashboard', + path: '/dashboard', meta: { - icon: 'carbon:workspace', - title: 'page.dashboard.workspace', - affixTab: true, - order: 0, + icon: 'lucide:layout-dashboard', + order: -1, + title: 'page.dashboard.title', }, + children: [ + { + id: 101, + pid: 1, + status: 1, + type: 'menu', + name: 'Analytics', + path: 'analytics', + component: '/dashboard/analytics/index', + meta: { + affixTab: true, + icon: 'lucide:area-chart', + title: 'page.dashboard.analytics', + keepAlive: true, + }, + }, + { + id: 102, + pid: 1, + status: 1, + type: 'menu', + name: 'Workspace', + path: 'workspace', + component: '/views/dashboard/workspace/index', + meta: { + icon: 'carbon:workspace', + title: 'page.dashboard.workspace', + }, + }, + ], }, { id: 2, diff --git a/apps/web-antd/src/views/demos/antd/index.vue b/apps/web-antd/src/views/demos/antd/index.vue index b3b05cc1..a1ff1ae2 100644 --- a/apps/web-antd/src/views/demos/antd/index.vue +++ b/apps/web-antd/src/views/demos/antd/index.vue @@ -12,7 +12,8 @@ function info() { function error() { message.error({ content: 'Once upon a time you dressed so fine', - duration: 2500, + // ant-design-vue 的 message.duration 单位是「秒」, 不是毫秒 + duration: 2.5, }); } @@ -25,7 +26,8 @@ function success() { function notify(type: NotificationType) { notification[type]({ - duration: 2500, + // ant-design-vue 的 notification.duration 单位是「秒」, 不是毫秒 + duration: 2.5, message: '说点啥呢', type, }); diff --git a/docs/src/components/common-ui/vben-alert.md b/docs/src/components/common-ui/vben-alert.md index eebd1f85..a14e47bb 100644 --- a/docs/src/components/common-ui/vben-alert.md +++ b/docs/src/components/common-ui/vben-alert.md @@ -80,10 +80,7 @@ export type PromptProps = { component?: Component; componentProps?: Recordable; componentSlots?: - | (() => any) - | Recordable - | VNode - | VNodeArrayChildren; + (() => any) | Recordable | VNode | VNodeArrayChildren; defaultValue?: T; modelPropName?: string; } & Omit; diff --git a/docs/src/demos/vben-descriptions/size/index.vue b/docs/src/demos/vben-descriptions/size/index.vue index d75a7e6b..cfb70dc4 100644 --- a/docs/src/demos/vben-descriptions/size/index.vue +++ b/docs/src/demos/vben-descriptions/size/index.vue @@ -9,7 +9,7 @@ const items = [ ];