diff --git a/README.zh-CN.md b/README.zh-CN.md index 2fd05a22..d655fa0b 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -14,12 +14,12 @@ V1.2.0版本对接warmflow工作流 ## 简介 -基于 [vben5 & ant-design-vue](https://github.com/vbenjs/vue-vben-admin) 的 RuoYi-Vue-Plus 前端项目 +基于 [vben5 & antdv-next](https://github.com/vbenjs/vue-vben-admin) 的 RuoYi-Vue-Plus 前端项目 | 组件/框架 | 版本 | | :------------- | :----- | | vben | 5.5.9 | -| ant-design-vue | 4.2.6 | +| antdv-next | 4.2.6 | | vue | 3.5.13 | 对应后端项目: **(分布式 5.X 分支 微服务 2.分支)** diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index c8df8b2e..3595f5c7 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -44,7 +44,7 @@ "@vben/types": "workspace:*", "@vben/utils": "workspace:*", "@vueuse/core": "catalog:", - "ant-design-vue": "catalog:", + "antdv-next": "catalog:", "cropperjs": "^1.6.2", "dayjs": "catalog:", "echarts": "^5.5.1", diff --git a/apps/web-antd/src/adapter/component/index.ts b/apps/web-antd/src/adapter/component/index.ts index 90ff7a45..99ff7e49 100644 --- a/apps/web-antd/src/adapter/component/index.ts +++ b/apps/web-antd/src/adapter/component/index.ts @@ -13,7 +13,7 @@ import { computed, defineAsyncComponent, defineComponent, h, ref } from 'vue'; import { ApiComponent, globalShareState, IconPicker } from '@vben/common-ui'; import { $t } from '@vben/locales'; -import { notification } from 'ant-design-vue'; +import { notification } from 'antdv-next'; import { FileUploadOld, ImageUploadOld } from '#/components/upload-old'; @@ -29,57 +29,68 @@ const ImageUpload = defineAsyncComponent(() => import('#/components/upload').then((res) => res.ImageUpload), ); -const AutoComplete = defineAsyncComponent( - () => import('ant-design-vue/es/auto-complete'), +const Button = defineAsyncComponent( + () => import('antdv-next/dist/button/index'), ); -const Button = defineAsyncComponent(() => import('ant-design-vue/es/button')); const Cascader = defineAsyncComponent( - () => import('ant-design-vue/es/cascader'), + () => import('antdv-next/dist/cascader/index'), ); const Checkbox = defineAsyncComponent( - () => import('ant-design-vue/es/checkbox'), + () => import('antdv-next/dist/checkbox/index'), ); -const CheckboxGroup = defineAsyncComponent(() => - import('ant-design-vue/es/checkbox').then((res) => res.CheckboxGroup), +const CheckboxGroup = defineAsyncComponent( + () => import('antdv-next/dist/checkbox/Group'), ); const DatePicker = defineAsyncComponent( - () => import('ant-design-vue/es/date-picker'), + () => import('antdv-next/dist/date-picker/index'), ); -const Divider = defineAsyncComponent(() => import('ant-design-vue/es/divider')); -const Input = defineAsyncComponent(() => import('ant-design-vue/es/input')); +const Divider = defineAsyncComponent( + () => import('antdv-next/dist/divider/index'), +); +const Input = defineAsyncComponent(() => import('antdv-next/dist/input/index')); const InputNumber = defineAsyncComponent( - () => import('ant-design-vue/es/input-number'), + () => import('antdv-next/dist/input-number/index'), ); -const InputPassword = defineAsyncComponent(() => - import('ant-design-vue/es/input').then((res) => res.InputPassword), +const InputPassword = defineAsyncComponent( + () => import('antdv-next/dist/input/Password'), ); const Mentions = defineAsyncComponent( - () => import('ant-design-vue/es/mentions'), + () => import('antdv-next/dist/mentions/index'), ); -const Radio = defineAsyncComponent(() => import('ant-design-vue/es/radio')); +const Radio = defineAsyncComponent(() => import('antdv-next/dist/radio/index')); const RadioGroup = defineAsyncComponent(() => - import('ant-design-vue/es/radio').then((res) => res.RadioGroup), + import('antdv-next/dist/radio/index').then((res) => res.RadioGroup), ); const RangePicker = defineAsyncComponent(() => - import('ant-design-vue/es/date-picker').then((res) => res.RangePicker), + import('antdv-next/dist/date-picker/index').then( + (res) => res.DateRangePicker, + ), ); -const Rate = defineAsyncComponent(() => import('ant-design-vue/es/rate')); -const Select = defineAsyncComponent(() => import('ant-design-vue/es/select')); -const Space = defineAsyncComponent(() => import('ant-design-vue/es/space')); -const Switch = defineAsyncComponent(() => import('ant-design-vue/es/switch')); -const Textarea = defineAsyncComponent(() => - import('ant-design-vue/es/input').then((res) => res.Textarea), +const Rate = defineAsyncComponent(() => import('antdv-next/dist/rate/index')); +const Select = defineAsyncComponent( + () => import('antdv-next/dist/select/index'), +); +const Space = defineAsyncComponent(() => import('antdv-next/dist/space/index')); +const Switch = defineAsyncComponent( + () => import('antdv-next/dist/switch/index'), +); +const Textarea = defineAsyncComponent( + () => import('antdv-next/dist/input/TextArea'), ); const TimePicker = defineAsyncComponent( - () => import('ant-design-vue/es/time-picker'), + () => import('antdv-next/dist/time-picker/index'), ); const TimeRangePicker = defineAsyncComponent(() => - import('ant-design-vue/es/time-picker').then((res) => res.TimeRangePicker), + import('antdv-next/dist/time-picker/index').then( + (res) => res.TimeRangePicker, + ), ); const TreeSelect = defineAsyncComponent( - () => import('ant-design-vue/es/tree-select'), + () => import('antdv-next/dist/tree-select/index'), +); +const Upload = defineAsyncComponent( + () => import('antdv-next/dist/upload/Upload'), ); -const Upload = defineAsyncComponent(() => import('ant-design-vue/es/upload')); const withDefaultPlaceholder = ( component: T, @@ -118,6 +129,7 @@ const withDefaultPlaceholder = ( ...props, ...attrs, ref: innerRef, + variant: 'outlined', }, slots, ); @@ -202,7 +214,6 @@ async function initComponentAdapter() { visibleEvent: 'onVisibleChange', }, ), - AutoComplete, Cascader: withDefaultPlaceholder(Cascader, 'select'), Checkbox, CheckboxGroup, @@ -253,7 +264,7 @@ async function initComponentAdapter() { copyPreferencesSuccess: (title, content) => { notification.success({ description: content, - message: title, + title, placement: 'bottomRight', }); }, diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index 6ad12af1..3e759b8b 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -4,7 +4,7 @@ import { h } from 'vue'; import { setupVbenVxeTable, useVbenVxeGrid } from '@vben/plugins/vxe-table'; -import { Button, Image } from 'ant-design-vue'; +import { Button, Image } from 'antdv-next'; import { useVbenForm } from './form'; diff --git a/apps/web-antd/src/api/helper.ts b/apps/web-antd/src/api/helper.ts index 55174d1c..0e977751 100644 --- a/apps/web-antd/src/api/helper.ts +++ b/apps/web-antd/src/api/helper.ts @@ -1,6 +1,6 @@ import { $t } from '@vben/locales'; -import { message, Modal } from 'ant-design-vue'; +import { message, Modal } from 'antdv-next'; import { useAuthStore } from '#/store'; diff --git a/apps/web-antd/src/api/request.ts b/apps/web-antd/src/api/request.ts index da719815..ae86227e 100644 --- a/apps/web-antd/src/api/request.ts +++ b/apps/web-antd/src/api/request.ts @@ -27,7 +27,7 @@ import { RsaEncryption, } from '@vben/utils'; -import { message, Modal } from 'ant-design-vue'; +import { message, Modal } from 'antdv-next'; import { isEmpty, isNull } from 'lodash-es'; import { useAuthStore } from '#/store'; diff --git a/apps/web-antd/src/app.vue b/apps/web-antd/src/app.vue index 8fb23900..4921d77d 100644 --- a/apps/web-antd/src/app.vue +++ b/apps/web-antd/src/app.vue @@ -4,7 +4,7 @@ import { computed } from 'vue'; import { useAntdDesignTokens } from '@vben/hooks'; import { preferences, usePreferences } from '@vben/preferences'; -import { App, ConfigProvider, theme } from 'ant-design-vue'; +import { App, ConfigProvider, theme } from 'antdv-next'; import { antdLocale } from '#/locales'; @@ -35,7 +35,7 @@ useUploadTip();