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: ( + + ), description: '绑定Gitee账号', source: 'gitee', title: 'Gitee', - style: { color: '#c71d23' }, }, { - avatar: markRaw(GithubOAuthIcon), + avatar: ( + + ), description: '绑定Github账号', source: 'github', title: 'Github', }, { - avatar: markRaw(SvgMaxKeyIcon), + avatar: , description: '绑定MaxKey账号', source: 'maxkey', title: 'MaxKey', }, { - avatar: markRaw(SvgTopiamIcon), + avatar: , description: '绑定topiam账号', source: 'topiam', title: 'Topiam', }, { - avatar: markRaw(SvgWechatIcon), + avatar: , 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" >

- +

点击或者拖拽到此处上传文件

@@ -92,7 +92,7 @@ function handleCancel() { @click="commonDownloadExcel(downloadImportTemplate, '用户导入模板')" >
- + 下载模板
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 @@