From 0934d7b78515b3889b4425a06b9b0adada0bf2e5 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Wed, 28 Jan 2026 09:59:05 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=BF=81=E7=A7=BB=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BB=8E=20@ant-design/icons-vue=20=E5=88=B0?=
 =?UTF-8?q?=20@antdv-next/icons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除对 @ant-design/icons-vue 的依赖，统一使用 @antdv-next/icons。
更新了 pnpm-workspace.yaml 中的包版本管理，并在多个 Vue 组件中修改了图标导入语句。
---
 apps/web-antd/package.json                                      | 1 -
 apps/web-antd/src/components/upload/src/file-upload.vue         | 2 +-
 apps/web-antd/src/components/upload/src/image-upload.vue        | 2 +-
 apps/web-antd/src/layouts/basic.vue                             | 2 +-
 apps/web-antd/src/views/system/dict/type/index-refactor.vue     | 2 +-
 apps/web-antd/src/views/system/user/dept-tree.vue               | 2 +-
 apps/web-antd/src/views/system/user/user-import-modal.vue       | 2 +-
 .../src/views/workflow/components/actions/flow-actions.vue      | 2 +-
 apps/web-antd/src/views/workflow/components/approval-panel.vue  | 2 +-
 .../src/views/workflow/components/approval-timeline-item.vue    | 2 +-
 .../src/views/workflow/components/approval-timeline.vue         | 2 +-
 .../src/views/workflow/processDefinition/category-tree.vue      | 2 +-
 .../processDefinition/process-definition-deploy-modal.vue       | 2 +-
 apps/web-antd/src/views/workflow/task/allTaskWaiting.vue        | 2 +-
 apps/web-antd/src/views/workflow/task/myDocument.vue            | 2 +-
 apps/web-antd/src/views/workflow/task/taskCopyList.vue          | 2 +-
 apps/web-antd/src/views/workflow/task/taskFinish.vue            | 2 +-
 apps/web-antd/src/views/workflow/task/taskWaiting.vue           | 2 +-
 pnpm-workspace.yaml                                             | 1 -
 19 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
index 23315e0f..370c7548 100644
--- a/apps/web-antd/package.json
+++ b/apps/web-antd/package.json
@@ -28,7 +28,6 @@
   },
   "dependencies": {
     "@alova/adapter-axios": "catalog:",
-    "@ant-design/icons-vue": "catalog:",
     "@antdv-next/icons": "catalog:",
     "@tinymce/tinymce-vue": "catalog:",
     "@vben/access": "workspace:*",
diff --git a/apps/web-antd/src/components/upload/src/file-upload.vue b/apps/web-antd/src/components/upload/src/file-upload.vue
index 8f969551..d411b72d 100644
--- a/apps/web-antd/src/components/upload/src/file-upload.vue
+++ b/apps/web-antd/src/components/upload/src/file-upload.vue
@@ -11,7 +11,7 @@ import { computed } from 'vue';
 
 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 { uploadApi } from '#/api';
diff --git a/apps/web-antd/src/components/upload/src/image-upload.vue b/apps/web-antd/src/components/upload/src/image-upload.vue
index a40da046..7a2a9367 100644
--- a/apps/web-antd/src/components/upload/src/image-upload.vue
+++ b/apps/web-antd/src/components/upload/src/image-upload.vue
@@ -9,7 +9,7 @@ import type { BaseUploadProps, UploadEmits } from './props';
 
 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 { isFunction } from 'lodash-es';
 
diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index d84d94a6..c7e59a83 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -16,7 +16,7 @@ import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
 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 { $t } from '#/locales';
diff --git a/apps/web-antd/src/views/system/dict/type/index-refactor.vue b/apps/web-antd/src/views/system/dict/type/index-refactor.vue
index 43abeded..13d77386 100644
--- a/apps/web-antd/src/views/system/dict/type/index-refactor.vue
+++ b/apps/web-antd/src/views/system/dict/type/index-refactor.vue
@@ -14,7 +14,7 @@ import {
   ExportOutlined,
   PlusOutlined,
   SyncOutlined,
-} from '@ant-design/icons-vue';
+} from '@antdv-next/icons';
 import { Alert, Input, Popconfirm, Space, Tooltip } from 'antdv-next';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
diff --git a/apps/web-antd/src/views/system/user/dept-tree.vue b/apps/web-antd/src/views/system/user/dept-tree.vue
index e3ae2924..130c3fcd 100644
--- a/apps/web-antd/src/views/system/user/dept-tree.vue
+++ b/apps/web-antd/src/views/system/user/dept-tree.vue
@@ -5,7 +5,7 @@ import type { DeptTree } from '#/api/system/user/model';
 
 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 { getDeptTree } from '#/api/system/user';
diff --git a/apps/web-antd/src/views/system/user/user-import-modal.vue b/apps/web-antd/src/views/system/user/user-import-modal.vue
index a3bf08f7..81ecad73 100644
--- a/apps/web-antd/src/views/system/user/user-import-modal.vue
+++ b/apps/web-antd/src/views/system/user/user-import-modal.vue
@@ -5,7 +5,7 @@ import { h, ref, unref } from 'vue';
 
 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 { downloadImportTemplate, userImportData } from '#/api/system/user';
diff --git a/apps/web-antd/src/views/workflow/components/actions/flow-actions.vue b/apps/web-antd/src/views/workflow/components/actions/flow-actions.vue
index 9ccb6ef4..4879fa03 100644
--- a/apps/web-antd/src/views/workflow/components/actions/flow-actions.vue
+++ b/apps/web-antd/src/views/workflow/components/actions/flow-actions.vue
@@ -20,7 +20,7 @@ import {
   UsergroupAddOutlined,
   UsergroupDeleteOutlined,
   UserOutlined,
-} from '@ant-design/icons-vue';
+} from '@antdv-next/icons';
 import { Dropdown, Menu, MenuItem, Space } from 'antdv-next';
 
 import {
diff --git a/apps/web-antd/src/views/workflow/components/approval-panel.vue b/apps/web-antd/src/views/workflow/components/approval-panel.vue
index 4d336ebe..4e768126 100644
--- a/apps/web-antd/src/views/workflow/components/approval-panel.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-panel.vue
@@ -14,7 +14,7 @@ import { Fallback, VbenAvatar } from '@vben/common-ui';
 import { DictEnum } from '@vben/constants';
 import { cn } from '@vben/utils';
 
-import { CopyOutlined } from '@ant-design/icons-vue';
+import { CopyOutlined } from '@antdv-next/icons';
 import { useClipboard } from '@vueuse/core';
 import { Card, Divider, TabPane, Tabs } from 'antdv-next';
 
diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue b/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue
index 6debac1d..ae6388f3 100644
--- a/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-timeline-item.vue
@@ -6,7 +6,7 @@ import { computed, h, onMounted, ref } from 'vue';
 import { DictEnum } from '@vben/constants';
 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 { ossInfo } from '#/api/system/oss';
diff --git a/apps/web-antd/src/views/workflow/components/approval-timeline.vue b/apps/web-antd/src/views/workflow/components/approval-timeline.vue
index c2a17108..2208be21 100644
--- a/apps/web-antd/src/views/workflow/components/approval-timeline.vue
+++ b/apps/web-antd/src/views/workflow/components/approval-timeline.vue
@@ -8,7 +8,7 @@ import { computed } from 'vue';
 import { VbenAvatar } from '@vben/common-ui';
 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 ApprovalTimelineItem from './approval-timeline-item.vue';
diff --git a/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue b/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue
index 629c8898..eeeebf4b 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/category-tree.vue
@@ -5,7 +5,7 @@ import type { CategoryTree } from '#/api/workflow/category/model';
 
 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 { categoryTree } from '#/api/workflow/category';
diff --git a/apps/web-antd/src/views/workflow/processDefinition/process-definition-deploy-modal.vue b/apps/web-antd/src/views/workflow/processDefinition/process-definition-deploy-modal.vue
index a8631d26..c541a63f 100644
--- a/apps/web-antd/src/views/workflow/processDefinition/process-definition-deploy-modal.vue
+++ b/apps/web-antd/src/views/workflow/processDefinition/process-definition-deploy-modal.vue
@@ -5,7 +5,7 @@ import { ref } from 'vue';
 
 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 { workflowDefinitionImport } from '#/api/workflow/definition';
diff --git a/apps/web-antd/src/views/workflow/task/allTaskWaiting.vue b/apps/web-antd/src/views/workflow/task/allTaskWaiting.vue
index f87a6575..f92e1760 100644
--- a/apps/web-antd/src/views/workflow/task/allTaskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/allTaskWaiting.vue
@@ -9,7 +9,7 @@ import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 import { addFullName, getPopupContainer } from '@vben/utils';
 
-import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
+import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
 import {
   Empty,
   Form,
diff --git a/apps/web-antd/src/views/workflow/task/myDocument.vue b/apps/web-antd/src/views/workflow/task/myDocument.vue
index b957b3cd..e4aed240 100644
--- a/apps/web-antd/src/views/workflow/task/myDocument.vue
+++ b/apps/web-antd/src/views/workflow/task/myDocument.vue
@@ -8,7 +8,7 @@ import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 import { getPopupContainer } from '@vben/utils';
 
-import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
+import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
 import {
   Empty,
   Form,
diff --git a/apps/web-antd/src/views/workflow/task/taskCopyList.vue b/apps/web-antd/src/views/workflow/task/taskCopyList.vue
index 53b65ecc..d899b68c 100644
--- a/apps/web-antd/src/views/workflow/task/taskCopyList.vue
+++ b/apps/web-antd/src/views/workflow/task/taskCopyList.vue
@@ -8,7 +8,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { addFullName, getPopupContainer } from '@vben/utils';
 
-import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
+import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
 import {
   Empty,
   Form,
diff --git a/apps/web-antd/src/views/workflow/task/taskFinish.vue b/apps/web-antd/src/views/workflow/task/taskFinish.vue
index 94b32ad1..7fb641a3 100644
--- a/apps/web-antd/src/views/workflow/task/taskFinish.vue
+++ b/apps/web-antd/src/views/workflow/task/taskFinish.vue
@@ -8,7 +8,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { addFullName, getPopupContainer } from '@vben/utils';
 
-import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
+import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
 import {
   Empty,
   Form,
diff --git a/apps/web-antd/src/views/workflow/task/taskWaiting.vue b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
index 22bfa9a3..c7d64e64 100644
--- a/apps/web-antd/src/views/workflow/task/taskWaiting.vue
+++ b/apps/web-antd/src/views/workflow/task/taskWaiting.vue
@@ -9,7 +9,7 @@ import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 import { addFullName, getPopupContainer } from '@vben/utils';
 
-import { FilterOutlined, RedoOutlined } from '@ant-design/icons-vue';
+import { FilterOutlined, RedoOutlined } from '@antdv-next/icons';
 import {
   Empty,
   Form,
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index d1329e39..c2fd3469 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -22,7 +22,6 @@ overrides:
 
 catalog:
   '@alova/adapter-axios': ^2.0.17
-  '@ant-design/icons-vue': ^7.0.1
   '@antdv-next/icons': 1.0.0-beta.1
   '@ast-grep/napi': ^0.39.9
   '@changesets/changelog-github': ^0.5.2