mirror of
https://gitee.com/dapppp/ruoyi-plus-vben5.git
synced 2026-04-08 16:43:15 +08:00
chore: 迁移图标依赖从 @ant-design/icons-vue 到 @antdv-next/icons
移除对 @ant-design/icons-vue 的依赖,统一使用 @antdv-next/icons。 更新了 pnpm-workspace.yaml 中的包版本管理,并在多个 Vue 组件中修改了图标导入语句。
This commit is contained in:
@@ -28,7 +28,6 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alova/adapter-axios": "catalog:",
|
"@alova/adapter-axios": "catalog:",
|
||||||
"@ant-design/icons-vue": "catalog:",
|
|
||||||
"@antdv-next/icons": "catalog:",
|
"@antdv-next/icons": "catalog:",
|
||||||
"@tinymce/tinymce-vue": "catalog:",
|
"@tinymce/tinymce-vue": "catalog:",
|
||||||
"@vben/access": "workspace:*",
|
"@vben/access": "workspace:*",
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { computed } from 'vue';
|
|||||||
|
|
||||||
import { $t, I18nT } from '@vben/locales';
|
import { $t, I18nT } from '@vben/locales';
|
||||||
|
|
||||||
import { InboxOutlined, UploadOutlined } from '@ant-design/icons-vue';
|
import { InboxOutlined, UploadOutlined } from '@antdv-next/icons';
|
||||||
import { Upload } from 'antdv-next';
|
import { Upload } from 'antdv-next';
|
||||||
|
|
||||||
import { uploadApi } from '#/api';
|
import { uploadApi } from '#/api';
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import type { BaseUploadProps, UploadEmits } from './props';
|
|||||||
|
|
||||||
import { $t, I18nT } from '@vben/locales';
|
import { $t, I18nT } from '@vben/locales';
|
||||||
|
|
||||||
import { PlusOutlined, UploadOutlined } from '@ant-design/icons-vue';
|
import { PlusOutlined, UploadOutlined } from '@antdv-next/icons';
|
||||||
import { Image, Upload } from 'antdv-next';
|
import { Image, Upload } from 'antdv-next';
|
||||||
import { isFunction } from 'lodash-es';
|
import { isFunction } from 'lodash-es';
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import { preferences } from '@vben/preferences';
|
|||||||
import { useAccessStore, useUserStore } from '@vben/stores';
|
import { useAccessStore, useUserStore } from '@vben/stores';
|
||||||
import { openWindow } from '@vben/utils';
|
import { openWindow } from '@vben/utils';
|
||||||
|
|
||||||
import { GithubOutlined, UserOutlined } from '@ant-design/icons-vue';
|
import { GithubOutlined, UserOutlined } from '@antdv-next/icons';
|
||||||
|
|
||||||
import { TenantToggle } from '#/components/tenant-toggle';
|
import { TenantToggle } from '#/components/tenant-toggle';
|
||||||
import { $t } from '#/locales';
|
import { $t } from '#/locales';
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import {
|
|||||||
ExportOutlined,
|
ExportOutlined,
|
||||||
PlusOutlined,
|
PlusOutlined,
|
||||||
SyncOutlined,
|
SyncOutlined,
|
||||||
} from '@ant-design/icons-vue';
|
} from '@antdv-next/icons';
|
||||||
import { Alert, Input, Popconfirm, Space, Tooltip } from 'antdv-next';
|
import { Alert, Input, Popconfirm, Space, Tooltip } from 'antdv-next';
|
||||||
|
|
||||||
import { useVbenVxeGrid } from '#/adapter/vxe-table';
|
import { useVbenVxeGrid } from '#/adapter/vxe-table';
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import type { DeptTree } from '#/api/system/user/model';
|
|||||||
|
|
||||||
import { onMounted, ref } from 'vue';
|
import { onMounted, ref } from 'vue';
|
||||||
|
|
||||||
import { SyncOutlined } from '@ant-design/icons-vue';
|
import { SyncOutlined } from '@antdv-next/icons';
|
||||||
import { Empty, InputSearch, Skeleton, Tree } from 'antdv-next';
|
import { Empty, InputSearch, Skeleton, Tree } from 'antdv-next';
|
||||||
|
|
||||||
import { getDeptTree } from '#/api/system/user';
|
import { getDeptTree } from '#/api/system/user';
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { h, ref, unref } from 'vue';
|
|||||||
|
|
||||||
import { useVbenModal } from '@vben/common-ui';
|
import { useVbenModal } from '@vben/common-ui';
|
||||||
|
|
||||||
import { InboxOutlined } from '@ant-design/icons-vue';
|
import { InboxOutlined } from '@antdv-next/icons';
|
||||||
import { Switch, Upload } from 'antdv-next';
|
import { Switch, Upload } from 'antdv-next';
|
||||||
|
|
||||||
import { downloadImportTemplate, userImportData } from '#/api/system/user';
|
import { downloadImportTemplate, userImportData } from '#/api/system/user';
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import {
|
|||||||
UsergroupAddOutlined,
|
UsergroupAddOutlined,
|
||||||
UsergroupDeleteOutlined,
|
UsergroupDeleteOutlined,
|
||||||
UserOutlined,
|
UserOutlined,
|
||||||
} from '@ant-design/icons-vue';
|
} from '@antdv-next/icons';
|
||||||
import { Dropdown, Menu, MenuItem, Space } from 'antdv-next';
|
import { Dropdown, Menu, MenuItem, Space } from 'antdv-next';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { Fallback, VbenAvatar } from '@vben/common-ui';
|
|||||||
import { DictEnum } from '@vben/constants';
|
import { DictEnum } from '@vben/constants';
|
||||||
import { cn } from '@vben/utils';
|
import { cn } from '@vben/utils';
|
||||||
|
|
||||||
import { CopyOutlined } from '@ant-design/icons-vue';
|
import { CopyOutlined } from '@antdv-next/icons';
|
||||||
import { useClipboard } from '@vueuse/core';
|
import { useClipboard } from '@vueuse/core';
|
||||||
import { Card, Divider, TabPane, Tabs } from 'antdv-next';
|
import { Card, Divider, TabPane, Tabs } from 'antdv-next';
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { computed, h, onMounted, ref } from 'vue';
|
|||||||
import { DictEnum } from '@vben/constants';
|
import { DictEnum } from '@vben/constants';
|
||||||
import { cn } from '@vben/utils';
|
import { cn } from '@vben/utils';
|
||||||
|
|
||||||
import { MessageOutlined, UserOutlined } from '@ant-design/icons-vue';
|
import { MessageOutlined, UserOutlined } from '@antdv-next/icons';
|
||||||
import { Avatar } from 'antdv-next';
|
import { Avatar } from 'antdv-next';
|
||||||
|
|
||||||
import { ossInfo } from '#/api/system/oss';
|
import { ossInfo } from '#/api/system/oss';
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { computed } from 'vue';
|
|||||||
import { VbenAvatar } from '@vben/common-ui';
|
import { VbenAvatar } from '@vben/common-ui';
|
||||||
import { cn } from '@vben/utils';
|
import { cn } from '@vben/utils';
|
||||||
|
|
||||||
import { UsergroupAddOutlined } from '@ant-design/icons-vue';
|
import { UsergroupAddOutlined } from '@antdv-next/icons';
|
||||||
import { Avatar, Empty, Timeline } from 'antdv-next';
|
import { Avatar, Empty, Timeline } from 'antdv-next';
|
||||||
|
|
||||||
import ApprovalTimelineItem from './approval-timeline-item.vue';
|
import ApprovalTimelineItem from './approval-timeline-item.vue';
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import type { CategoryTree } from '#/api/workflow/category/model';
|
|||||||
|
|
||||||
import { onMounted, ref } from 'vue';
|
import { onMounted, ref } from 'vue';
|
||||||
|
|
||||||
import { SyncOutlined } from '@ant-design/icons-vue';
|
import { SyncOutlined } from '@antdv-next/icons';
|
||||||
import { InputSearch, Skeleton, Tree } from 'antdv-next';
|
import { InputSearch, Skeleton, Tree } from 'antdv-next';
|
||||||
|
|
||||||
import { categoryTree } from '#/api/workflow/category';
|
import { categoryTree } from '#/api/workflow/category';
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { ref } from 'vue';
|
|||||||
|
|
||||||
import { useVbenModal } from '@vben/common-ui';
|
import { useVbenModal } from '@vben/common-ui';
|
||||||
|
|
||||||
import { InboxOutlined } from '@ant-design/icons-vue';
|
import { InboxOutlined } from '@antdv-next/icons';
|
||||||
import { Upload } from 'antdv-next';
|
import { Upload } from 'antdv-next';
|
||||||
|
|
||||||
import { workflowDefinitionImport } from '#/api/workflow/definition';
|
import { workflowDefinitionImport } from '#/api/workflow/definition';
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { Page } from '@vben/common-ui';
|
|||||||
import { useTabs } from '@vben/hooks';
|
import { useTabs } from '@vben/hooks';
|
||||||
import { addFullName, getPopupContainer } from '@vben/utils';
|
import { addFullName, getPopupContainer } from '@vben/utils';
|
||||||
|
|
||||||
import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
|
import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
|
||||||
import {
|
import {
|
||||||
Empty,
|
Empty,
|
||||||
Form,
|
Form,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { Page } from '@vben/common-ui';
|
|||||||
import { useTabs } from '@vben/hooks';
|
import { useTabs } from '@vben/hooks';
|
||||||
import { getPopupContainer } from '@vben/utils';
|
import { getPopupContainer } from '@vben/utils';
|
||||||
|
|
||||||
import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
|
import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
|
||||||
import {
|
import {
|
||||||
Empty,
|
Empty,
|
||||||
Form,
|
Form,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
|
|||||||
import { Page } from '@vben/common-ui';
|
import { Page } from '@vben/common-ui';
|
||||||
import { addFullName, getPopupContainer } from '@vben/utils';
|
import { addFullName, getPopupContainer } from '@vben/utils';
|
||||||
|
|
||||||
import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
|
import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
|
||||||
import {
|
import {
|
||||||
Empty,
|
Empty,
|
||||||
Form,
|
Form,
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
|
|||||||
import { Page } from '@vben/common-ui';
|
import { Page } from '@vben/common-ui';
|
||||||
import { addFullName, getPopupContainer } from '@vben/utils';
|
import { addFullName, getPopupContainer } from '@vben/utils';
|
||||||
|
|
||||||
import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
|
import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
|
||||||
import {
|
import {
|
||||||
Empty,
|
Empty,
|
||||||
Form,
|
Form,
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { Page } from '@vben/common-ui';
|
|||||||
import { useTabs } from '@vben/hooks';
|
import { useTabs } from '@vben/hooks';
|
||||||
import { addFullName, getPopupContainer } from '@vben/utils';
|
import { addFullName, getPopupContainer } from '@vben/utils';
|
||||||
|
|
||||||
import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
|
import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
|
||||||
import {
|
import {
|
||||||
Empty,
|
Empty,
|
||||||
Form,
|
Form,
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ overrides:
|
|||||||
|
|
||||||
catalog:
|
catalog:
|
||||||
'@alova/adapter-axios': ^2.0.17
|
'@alova/adapter-axios': ^2.0.17
|
||||||
'@ant-design/icons-vue': ^7.0.1
|
|
||||||
'@antdv-next/icons': 1.0.0-beta.1
|
'@antdv-next/icons': 1.0.0-beta.1
|
||||||
'@ast-grep/napi': ^0.39.9
|
'@ast-grep/napi': ^0.39.9
|
||||||
'@changesets/changelog-github': ^0.5.2
|
'@changesets/changelog-github': ^0.5.2
|
||||||
|
|||||||
Reference in New Issue
Block a user