From 948dc9b5208a22ffa796598a70b86bd776d91742 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 23 Jan 2026 10:42:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(icons):=20=E8=BF=81=E7=A7=BB=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=9B=BE=E6=A0=87=E5=88=B0=20@ant-design/icons-vue=20?=
 =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除 @vben/icons 中的 UserOutlined、InBoxIcon、ExcelIcon 等图标，改用 @ant-design/icons-vue 提供的对应组件。
删除 packages/icons 中未使用的离线图标定义，包括 TaobaoIcon、AlipayIcon、GithubOAuthIcon 等。
在 apps/web-antd/src/views/_core/ 新增 oauth-common.tsx 文件，集中管理 OAuth 绑定相关逻辑与数据。
---
 apps/web-antd/src/layouts/basic.vue           |  3 +-
 .../{oauth-common.ts => oauth-common.tsx}     | 29 ++++++++++---------
 .../views/system/user/user-import-modal.vue   |  6 ++--
 .../process-definition-deploy-modal.vue       |  6 ++--
 .../common-ui/src/ui/authentication/index.ts  |  2 +-
 packages/icons/src/iconify-offline/index.ts   | 29 -------------------
 6 files changed, 24 insertions(+), 51 deletions(-)
 rename apps/web-antd/src/views/_core/{oauth-common.ts => oauth-common.tsx} (80%)

diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index c60d5eee..d230a3dd 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -10,7 +10,6 @@ import {
   CircleHelp,
   GiteeIcon,
   GitHubOutlined,
-  UserOutlined,
 } from '@vben/icons';
 import {
   BasicLayout,
@@ -22,6 +21,8 @@ import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
 import { openWindow } from '@vben/utils';
 
+import { UserOutlined } from '@ant-design/icons-vue';
+
 import { TenantToggle } from '#/components/tenant-toggle';
 import { $t } from '#/locales';
 import { resetRoutes } from '#/router';
diff --git a/apps/web-antd/src/views/_core/oauth-common.ts b/apps/web-antd/src/views/_core/oauth-common.tsx
similarity index 80%
rename from apps/web-antd/src/views/_core/oauth-common.ts
rename to apps/web-antd/src/views/_core/oauth-common.tsx
index 64c3ef30..4b78bf5a 100644
--- a/apps/web-antd/src/views/_core/oauth-common.ts
+++ b/apps/web-antd/src/views/_core/oauth-common.tsx
@@ -1,15 +1,10 @@
 import type { Component, CSSProperties } from 'vue';
 
-import { markRaw, ref } from 'vue';
+import { ref } from 'vue';
 
 import { DEFAULT_TENANT_ID } from '@vben/constants';
-import {
-  GiteeIcon,
-  GithubOAuthIcon,
-  SvgMaxKeyIcon,
-  SvgTopiamIcon,
-  SvgWechatIcon,
-} from '@vben/icons';
+import { VbenIcon } from '@vben/icons';
+import { cn } from '@vben/utils';
 
 import { createGlobalState } from '@vueuse/core';
 
@@ -69,32 +64,38 @@ export async function handleAuthBinding(source: string) {
  */
 export const accountBindList: BindItem[] = [
   {
-    avatar: markRaw(GiteeIcon),
+    avatar: (
+      <span
+        class={cn('icon-[simple-icons--gitee]', 'size-6')}
+        style={{ color: '#c71d23' }}
+      />
+    ),
     description: '绑定Gitee账号',
     source: 'gitee',
     title: 'Gitee',
-    style: { color: '#c71d23' },
   },
   {
-    avatar: markRaw(GithubOAuthIcon),
+    avatar: (
+      <span class={cn('icon-[fa--github-alt]', 'text-[#333]', 'size-6')} />
+    ),
     description: '绑定Github账号',
     source: 'github',
     title: 'Github',
   },
   {
-    avatar: markRaw(SvgMaxKeyIcon),
+    avatar: <VbenIcon icon={'svg:max-key'} />,
     description: '绑定MaxKey账号',
     source: 'maxkey',
     title: 'MaxKey',
   },
   {
-    avatar: markRaw(SvgTopiamIcon),
+    avatar: <VbenIcon icon={'svg:topiam'} />,
     description: '绑定topiam账号',
     source: 'topiam',
     title: 'Topiam',
   },
   {
-    avatar: markRaw(SvgWechatIcon),
+    avatar: <VbenIcon icon={'svg:wechat'} />,
     description: '绑定wechat账号',
     source: 'wechat',
     title: 'Wechat',
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 09dc3c37..a3bf08f7 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
@@ -4,8 +4,8 @@ import type { UploadFile } from 'antdv-next';
 import { h, ref, unref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { ExcelIcon, InBoxIcon } from '@vben/icons';
 
+import { InboxOutlined } from '@ant-design/icons-vue';
 import { Switch, Upload } from 'antdv-next';
 
 import { downloadImportTemplate, userImportData } from '#/api/system/user';
@@ -80,7 +80,7 @@ function handleCancel() {
       accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
     >
       <p class="ant-upload-drag-icon flex items-center justify-center">
-        <InBoxIcon class="size-[48px] text-primary" />
+        <InboxOutlined class="size-[48px] text-primary" />
       </p>
       <p class="ant-upload-text">点击或者拖拽到此处上传文件</p>
     </UploadDragger>
@@ -92,7 +92,7 @@ function handleCancel() {
           @click="commonDownloadExcel(downloadImportTemplate, '用户导入模板')"
         >
           <div class="flex items-center gap-[4px]">
-            <ExcelIcon />
+            <span class="icon-[vscode-icons--file-type-excel]"></span>
             <span>下载模板</span>
           </div>
         </a-button>
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 f52817e3..a8631d26 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
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import type { UploadFile } from 'antdv-next/es/upload/interface';
+import type { UploadFile } from 'antdv-next';
 
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { InBoxIcon } from '@vben/icons';
 
+import { InboxOutlined } from '@ant-design/icons-vue';
 import { Upload } from 'antdv-next';
 
 import { workflowDefinitionImport } from '#/api/workflow/definition';
@@ -65,7 +65,7 @@ function handleCancel() {
       accept="application/json"
     >
       <p class="ant-upload-drag-icon flex items-center justify-center">
-        <InBoxIcon class="text-primary size-[48px]" />
+        <InboxOutlined class="size-[48px] text-primary" />
       </p>
       <p class="ant-upload-text">点击或者拖拽到此处上传[json]文件</p>
     </UploadDragger>
diff --git a/packages/effects/common-ui/src/ui/authentication/index.ts b/packages/effects/common-ui/src/ui/authentication/index.ts
index dcd05b71..bb09b2eb 100644
--- a/packages/effects/common-ui/src/ui/authentication/index.ts
+++ b/packages/effects/common-ui/src/ui/authentication/index.ts
@@ -1,7 +1,7 @@
 export { default as AuthenticationCodeLogin } from './code-login.vue';
 export { default as AuthenticationForgetPassword } from './forget-password.vue';
-export { default as AuthenticationLogin } from './login.vue';
 export { default as AuthenticationLoginExpiredModal } from './login-expired-modal.vue';
+export { default as AuthenticationLogin } from './login.vue';
 export { default as AuthenticationQrCodeLogin } from './qrcode-login.vue';
 export { default as AuthenticationRegister } from './register.vue';
 export type {
diff --git a/packages/icons/src/iconify-offline/index.ts b/packages/icons/src/iconify-offline/index.ts
index 113bb2ae..216c154a 100644
--- a/packages/icons/src/iconify-offline/index.ts
+++ b/packages/icons/src/iconify-offline/index.ts
@@ -1,14 +1,12 @@
 import { createIconifyOfflineIcon } from '@vben-core/icons';
 
 import githubOutlined from '@iconify/icons-ant-design/github-outlined';
-import inboxIcon from '@iconify/icons-ant-design/inbox-outlined';
 import userOutlined from '@iconify/icons-ant-design/user-outlined';
 import ucIcon from '@iconify/icons-arcticons/uc-browser';
 import defaultFileIcon from '@iconify/icons-bx/file';
 import sqlIcon from '@iconify/icons-carbon/sql';
 import linuxIcon from '@iconify/icons-devicon/linux';
 import windowsIcon from '@iconify/icons-devicon/windows8';
-import alipayIcon from '@iconify/icons-fa-brands/alipay';
 import androidIcon from '@iconify/icons-flat-color-icons/android-os';
 import folderIcon from '@iconify/icons-flat-color-icons/folder';
 import defaultOsIcon from '@iconify/icons-ic/outline-computer';
@@ -27,14 +25,11 @@ import defaultBrowserIcon from '@iconify/icons-ph/browser-duotone';
 import baiduIcon from '@iconify/icons-ri/baidu-fill';
 import dingdingFill from '@iconify/icons-ri/dingding-fill';
 import dingtalkIcon from '@iconify/icons-ri/dingding-line';
-import taobaoIconFill from '@iconify/icons-ri/taobao-fill';
 import giteeIcon from '@iconify/icons-simple-icons/gitee';
 import qqIcon from '@iconify/icons-simple-icons/tencentqq';
 import javaIcon from '@iconify/icons-skill-icons/java-light';
 import tsIcon from '@iconify/icons-skill-icons/typescript';
 import xmlIcon from '@iconify/icons-tabler/file-type-xml';
-import githubOAuthIcon from '@iconify/icons-uiw/github';
-import excelIcon from '@iconify/icons-vscode-icons/file-type-excel';
 import osxIcon from '@iconify/icons-wpf/macos';
 
 import './menu-icons';
@@ -50,27 +45,7 @@ export const UserOutlined = createIconifyOfflineIcon(
   userOutlined,
 );
 
-// 用户管理 导入
-// Excel图标
-export const ExcelIcon = createIconifyOfflineIcon(
-  'vscode-icons:file-type-excel',
-  excelIcon,
-);
-// 拖拽上传图标
-export const InBoxIcon = createIconifyOfflineIcon(
-  'ant-design:inbox-outlined',
-  inboxIcon,
-);
-
 // 第三方登录相关图标
-export const TaobaoIcon = createIconifyOfflineIcon(
-  'ri:taobao-fill',
-  taobaoIconFill,
-);
-export const AlipayIcon = createIconifyOfflineIcon(
-  'fa-brands:alipay',
-  alipayIcon,
-);
 export const DingdingIcon = createIconifyOfflineIcon(
   'ri:dingding-fill',
   dingdingFill,
@@ -79,10 +54,6 @@ export const GiteeIcon = createIconifyOfflineIcon(
   'simple-icons:gitee',
   giteeIcon,
 );
-export const GithubOAuthIcon = createIconifyOfflineIcon(
-  'uiw:github',
-  githubOAuthIcon,
-);
 
 // 系统相关图标
 export const WindowsIcon = createIconifyOfflineIcon(