diff --git a/apps/web-antdv-next/package.json b/apps/web-antdv-next/package.json index d894d64cb..4ccfbb787 100644 --- a/apps/web-antdv-next/package.json +++ b/apps/web-antdv-next/package.json @@ -46,7 +46,7 @@ "@videojs-player/vue": "catalog:", "@vueuse/core": "catalog:", "@vueuse/integrations": "catalog:", - "ant-design-vue": "catalog:", + "antdv-next": "catalog:", "benz-amr-recorder": "catalog:", "bpmn-js": "catalog:", "bpmn-js-properties-panel": "catalog:", diff --git a/apps/web-antdv-next/src/adapter/component/index.ts b/apps/web-antdv-next/src/adapter/component/index.ts index e2563bdd3..3565f964f 100644 --- a/apps/web-antdv-next/src/adapter/component/index.ts +++ b/apps/web-antdv-next/src/adapter/component/index.ts @@ -18,6 +18,7 @@ import type { MentionsProps, RadioGroupProps, RadioProps, + RangePickerProps, RateProps, SelectProps, SpaceProps, @@ -28,8 +29,7 @@ import type { UploadChangeParam, UploadFile, UploadProps, -} from 'ant-design-vue'; -import type { RangePickerProps } from 'ant-design-vue/es/date-picker'; +} from 'antdv-next'; import type { Component, Ref } from 'vue'; @@ -43,7 +43,6 @@ import type { Recordable } from '@vben/types'; import { computed, - defineAsyncComponent, defineComponent, h, nextTick, @@ -66,7 +65,36 @@ import { IconifyIcon } from '@vben/icons'; import { $t } from '@vben/locales'; import { isEmpty } from '@vben/utils'; -import { message, Modal, notification } from 'ant-design-vue'; +import { + AutoComplete as AutoCompleteComponent, + Button, + Cascader as CascaderComponent, + Checkbox as CheckboxComponent, + CheckboxGroup as CheckboxGroupComponent, + DatePicker as DatePickerComponent, + Divider as DividerComponent, + Image as ImageComponent, + ImagePreviewGroup, + Input as InputComponent, + InputNumber as InputNumberComponent, + InputPassword, + Mentions as MentionsComponent, + message, + Modal, + notification, + Radio as RadioComponent, + RadioGroup as RadioGroupComponent, + DateRangePicker as RangePickerComponent, + Rate as RateComponent, + Select as SelectComponent, + Space as SpaceComponent, + Switch as SwitchComponent, + TextArea as TextareaComponent, + TimePicker as TimePickerComponent, + TimeRangePicker as TimeRangePickerComponent, + TreeSelect as TreeSelectComponent, + Upload as UploadComponent, +} from 'antdv-next'; import { Tinymce as RichTextarea } from '#/components/tinymce'; import { FileUpload, ImageUpload } from '#/components/upload'; @@ -80,61 +108,29 @@ type AdapterUploadProps = UploadProps & { onHandleChange?: (event: UploadChangeParam) => void; }; -const AutoComplete = defineAsyncComponent( - () => import('ant-design-vue/es/auto-complete'), -); -const Button = defineAsyncComponent(() => import('ant-design-vue/es/button')); -const Checkbox = defineAsyncComponent( - () => import('ant-design-vue/es/checkbox'), -); -const CheckboxGroup = defineAsyncComponent(() => - import('ant-design-vue/es/checkbox').then((res) => res.CheckboxGroup), -); -const DatePicker = defineAsyncComponent( - () => import('ant-design-vue/es/date-picker'), -); -const Divider = defineAsyncComponent(() => import('ant-design-vue/es/divider')); -const Input = defineAsyncComponent(() => import('ant-design-vue/es/input')); -const InputNumber = defineAsyncComponent( - () => import('ant-design-vue/es/input-number'), -); -const InputPassword = defineAsyncComponent(() => - import('ant-design-vue/es/input').then((res) => res.InputPassword), -); -const Mentions = defineAsyncComponent( - () => import('ant-design-vue/es/mentions'), -); -const Radio = defineAsyncComponent(() => import('ant-design-vue/es/radio')); -const RadioGroup = defineAsyncComponent(() => - import('ant-design-vue/es/radio').then((res) => res.RadioGroup), -); -const RangePicker = defineAsyncComponent(() => - import('ant-design-vue/es/date-picker').then((res) => res.RangePicker), -); -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 TimePicker = defineAsyncComponent( - () => import('ant-design-vue/es/time-picker'), -); -const TimeRangePicker = defineAsyncComponent(() => - import('ant-design-vue/es/time-picker').then((res) => res.TimeRangePicker), -); -const TreeSelect = defineAsyncComponent( - () => import('ant-design-vue/es/tree-select'), -); -const Cascader = defineAsyncComponent( - () => import('ant-design-vue/es/cascader'), -); -const Upload = defineAsyncComponent(() => import('ant-design-vue/es/upload')); -const Image = defineAsyncComponent(() => import('ant-design-vue/es/image')); -const PreviewGroup = defineAsyncComponent(() => - import('ant-design-vue/es/image').then((res) => res.ImagePreviewGroup), -); +const AutoComplete = AutoCompleteComponent; +const Checkbox = CheckboxComponent; +const CheckboxGroup = CheckboxGroupComponent; +const DatePicker = DatePickerComponent; +const Divider = DividerComponent; +const Input = InputComponent; +const InputNumber = InputNumberComponent; +const Mentions = MentionsComponent; +const Radio = RadioComponent; +const RadioGroup = RadioGroupComponent; +const RangePicker = RangePickerComponent; +const Rate = RateComponent; +const Select = SelectComponent; +const Space = SpaceComponent; +const Switch = SwitchComponent; +const Textarea = TextareaComponent; +const TimePicker = TimePickerComponent; +const TimeRangePicker = TimeRangePickerComponent; +const TreeSelect = TreeSelectComponent; +const Cascader = CascaderComponent; +const Upload = UploadComponent; +const Image = ImageComponent; +const PreviewGroup = ImagePreviewGroup; const withDefaultPlaceholder = ( component: T, @@ -745,7 +741,7 @@ async function initComponentAdapter() { copyPreferencesSuccess: (title, content) => { notification.success({ description: content, - message: title, + title, placement: 'bottomRight', }); }, diff --git a/apps/web-antdv-next/src/adapter/vxe-table.ts b/apps/web-antdv-next/src/adapter/vxe-table.ts index 554ae3a1e..9565c2747 100644 --- a/apps/web-antdv-next/src/adapter/vxe-table.ts +++ b/apps/web-antdv-next/src/adapter/vxe-table.ts @@ -31,7 +31,7 @@ import { Popconfirm, Switch, Tag, -} from 'ant-design-vue'; +} from 'antdv-next'; import { DictTag } from '#/components/dict-tag'; import { $t } from '#/locales'; diff --git a/apps/web-antdv-next/src/api/request.ts b/apps/web-antdv-next/src/api/request.ts index 7389c31ad..c28c17eb9 100644 --- a/apps/web-antdv-next/src/api/request.ts +++ b/apps/web-antdv-next/src/api/request.ts @@ -14,7 +14,7 @@ import { import { useAccessStore } from '@vben/stores'; import { createApiEncrypt } from '@vben/utils'; -import { message } from 'ant-design-vue'; +import { message } from 'antdv-next'; import { useAuthStore } from '#/store'; diff --git a/apps/web-antdv-next/src/app.vue b/apps/web-antdv-next/src/app.vue index bbaccce13..59ca86183 100644 --- a/apps/web-antdv-next/src/app.vue +++ b/apps/web-antdv-next/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'; diff --git a/apps/web-antdv-next/src/bootstrap.ts b/apps/web-antdv-next/src/bootstrap.ts index be5a5eda7..22bcc28b2 100644 --- a/apps/web-antdv-next/src/bootstrap.ts +++ b/apps/web-antdv-next/src/bootstrap.ts @@ -6,7 +6,7 @@ import { registerLoadingDirective } from '@vben/common-ui/es/loading'; import { preferences } from '@vben/preferences'; import { initStores } from '@vben/stores'; import '@vben/styles'; -import '@vben/styles/antd'; +import '@vben/styles/antdv-next'; import { useTitle } from '@vueuse/core'; diff --git a/apps/web-antdv-next/src/components/cron-tab/cron-tab.vue b/apps/web-antdv-next/src/components/cron-tab/cron-tab.vue index 242ecb554..59bf8004e 100644 --- a/apps/web-antdv-next/src/components/cron-tab/cron-tab.vue +++ b/apps/web-antdv-next/src/components/cron-tab/cron-tab.vue @@ -16,7 +16,7 @@ import { RadioGroup, Select, Tabs, -} from 'ant-design-vue'; +} from 'antdv-next'; import { CronDataDefault, CronValueDefault } from './types'; @@ -417,20 +417,20 @@ function inputChange() { > @@ -443,7 +443,7 @@ function inputChange() { >
- +
- + 任意值 范围 间隔 指定 - - + + - - + + 秒执行一次 - - + + - +
-
+ - +
- + 任意值 范围 间隔 指定 - - + + - - + + 分钟执行一次 - - + + - +
-
+ - +
- + 任意值 范围 间隔 指定 - - + + - - + + 小时执行一次 - - + + - +
-
+ - +
- + 任意值 范围 @@ -652,8 +652,8 @@ function inputChange() { 本月最后一天 不指定 - - + + - - + + 天执行一次 - - + + - +
-
+ - +
- + 任意值 范围 间隔 指定 - - + + - - + + 月执行一次 - - + + - +
-
+ - +
- + 任意值 范围 @@ -782,10 +782,10 @@ function inputChange() { 本月最后一周 不指定 - - + + - - - + + 周的星期 执行一次 - - + + - - + + - +
-
+ - +
- + 忽略 任意值 @@ -864,8 +864,8 @@ function inputChange() { 间隔 指定 - - + + - - + + 年执行一次 - - + + - +
-
+
diff --git a/apps/web-antdv-next/src/components/cropper/cropper-avatar.vue b/apps/web-antdv-next/src/components/cropper/cropper-avatar.vue index 72c71d031..8afed133c 100644 --- a/apps/web-antdv-next/src/components/cropper/cropper-avatar.vue +++ b/apps/web-antdv-next/src/components/cropper/cropper-avatar.vue @@ -9,7 +9,7 @@ import { useVbenModal } from '@vben/common-ui'; import { IconifyIcon } from '@vben/icons'; import { $t } from '@vben/locales'; -import { Button, message } from 'ant-design-vue'; +import { Button, message } from 'antdv-next'; import cropperModal from './cropper-modal.vue'; diff --git a/apps/web-antdv-next/src/components/cropper/cropper-modal.vue b/apps/web-antdv-next/src/components/cropper/cropper-modal.vue index 01effd727..85feef0a2 100644 --- a/apps/web-antdv-next/src/components/cropper/cropper-modal.vue +++ b/apps/web-antdv-next/src/components/cropper/cropper-modal.vue @@ -8,14 +8,7 @@ import { IconifyIcon } from '@vben/icons'; import { $t } from '@vben/locales'; import { dataURLtoBlob, isFunction } from '@vben/utils'; -import { - Avatar, - Button, - message, - Space, - Tooltip, - Upload, -} from 'ant-design-vue'; +import { Avatar, Button, message, Space, Tooltip, Upload } from 'antdv-next'; import CropperImage from './cropper.vue'; diff --git a/apps/web-antdv-next/src/components/cropper/typing.ts b/apps/web-antdv-next/src/components/cropper/typing.ts index f471274b4..58cffb2b5 100644 --- a/apps/web-antdv-next/src/components/cropper/typing.ts +++ b/apps/web-antdv-next/src/components/cropper/typing.ts @@ -1,4 +1,4 @@ -import type { ButtonProps } from 'ant-design-vue'; +import type { ButtonProps } from 'antdv-next'; import type Cropper from 'cropperjs'; import type { CSSProperties } from 'vue'; diff --git a/apps/web-antdv-next/src/components/description/description.vue b/apps/web-antdv-next/src/components/description/description.vue index d591e5722..86f90c8d4 100644 --- a/apps/web-antdv-next/src/components/description/description.vue +++ b/apps/web-antdv-next/src/components/description/description.vue @@ -1,5 +1,5 @@ diff --git a/apps/web-antdv-next/src/views/ai/chat/index/modules/conversation/update-form.vue b/apps/web-antdv-next/src/views/ai/chat/index/modules/conversation/update-form.vue index fda49d734..e581542fc 100644 --- a/apps/web-antdv-next/src/views/ai/chat/index/modules/conversation/update-form.vue +++ b/apps/web-antdv-next/src/views/ai/chat/index/modules/conversation/update-form.vue @@ -5,7 +5,7 @@ import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; -import { message } from 'ant-design-vue'; +import { message } from 'antdv-next'; import { useVbenForm } from '#/adapter/form'; import { diff --git a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/file-upload.vue b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/file-upload.vue index 3d5e27fb0..3cac94cfb 100644 --- a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/file-upload.vue +++ b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/file-upload.vue @@ -4,7 +4,7 @@ import { computed, onUnmounted, ref, watch } from 'vue'; import { IconifyIcon } from '@vben/icons'; import { formatFileSize, getFileIcon } from '@vben/utils'; -import { message } from 'ant-design-vue'; +import { message } from 'antdv-next'; import { useUpload } from '#/components/upload/use-upload'; diff --git a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/knowledge.vue b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/knowledge.vue index 960188c04..92dc19c92 100644 --- a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/knowledge.vue +++ b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/knowledge.vue @@ -3,7 +3,7 @@ import { computed, ref } from 'vue'; import { IconifyIcon } from '@vben/icons'; -import { Tooltip } from 'ant-design-vue'; +import { Tooltip } from 'antdv-next'; const props = defineProps<{ segments: { diff --git a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/list.vue b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/list.vue index a841ee29b..b3fb568f7 100644 --- a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/list.vue +++ b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/list.vue @@ -12,7 +12,7 @@ import { useUserStore } from '@vben/stores'; import { formatDateTime } from '@vben/utils'; import { useClipboard } from '@vueuse/core'; -import { Avatar, Button, message } from 'ant-design-vue'; +import { Avatar, Button, message } from 'antdv-next'; import { deleteChatMessage } from '#/api/ai/chat/message'; import { MarkdownView } from '#/components/markdown-view'; diff --git a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/loading.vue b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/loading.vue index 5928a19a1..96c0e3386 100644 --- a/apps/web-antdv-next/src/views/ai/chat/index/modules/message/loading.vue +++ b/apps/web-antdv-next/src/views/ai/chat/index/modules/message/loading.vue @@ -1,5 +1,5 @@