From a46afa201de1a9a4581fa689956d8bdc0c0a0374 Mon Sep 17 00:00:00 2001 From: K <1175047471@qq.com> Date: Wed, 17 Jan 2024 09:44:19 +0800 Subject: [PATCH] fix: icon display issue --- src/components/Cropper/src/CopperModal.vue | 12 ++++---- src/components/Upload/src/BasicUpload.vue | 2 +- src/enums/appEnum.ts | 36 +++++++++++----------- src/layouts/default/tabs/useTabDropdown.ts | 13 ++++---- src/router/routes/index.ts | 2 +- src/views/base/profile/BaseSetting.vue | 2 +- src/views/system/notify/my/index.vue | 4 +-- 7 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/components/Cropper/src/CopperModal.vue b/src/components/Cropper/src/CopperModal.vue index b533b12..632c596 100644 --- a/src/components/Cropper/src/CopperModal.vue +++ b/src/components/Cropper/src/CopperModal.vue @@ -109,14 +109,14 @@ async function handleOk() { <div :class="`${prefixCls}-toolbar`"> <Upload :file-list="[]" accept="image/*" :before-upload="handleBeforeUpload"> <Tooltip :title="t('component.cropper.selectImage')" placement="bottom"> - <a-button size="small" pre-icon="ant-design:upload-outlined" type="primary" /> + <a-button size="small" pre-icon="i-ant-design:upload-outlined" type="primary" /> </Tooltip> </Upload> <Space> <Tooltip :title="t('component.cropper.btn_reset')" placement="bottom"> <a-button type="primary" - pre-icon="ant-design:reload-outlined" + pre-icon="i-ant-design:reload-outlined" size="small" :disabled="!src" @click="handlerToolbar('reset')" @@ -125,7 +125,7 @@ async function handleOk() { <Tooltip :title="t('component.cropper.btn_rotate_left')" placement="bottom"> <a-button type="primary" - pre-icon="ant-design:rotate-left-outlined" + pre-icon="i-ant-design:rotate-left-outlined" size="small" :disabled="!src" @click="handlerToolbar('rotate', -45)" @@ -134,7 +134,7 @@ async function handleOk() { <Tooltip :title="t('component.cropper.btn_rotate_right')" placement="bottom"> <a-button type="primary" - pre-icon="ant-design:rotate-right-outlined" + pre-icon="i-ant-design:rotate-right-outlined" size="small" :disabled="!src" @click="handlerToolbar('rotate', 45)" @@ -149,7 +149,7 @@ async function handleOk() { <Tooltip :title="t('component.cropper.btn_zoom_in')" placement="bottom"> <a-button type="primary" - pre-icon="ant-design:zoom-in-outlined" + pre-icon="i-ant-design:zoom-in-outlined" size="small" :disabled="!src" @click="handlerToolbar('zoom', 0.1)" @@ -158,7 +158,7 @@ async function handleOk() { <Tooltip :title="t('component.cropper.btn_zoom_out')" placement="bottom"> <a-button type="primary" - pre-icon="ant-design:zoom-out-outlined" + pre-icon="i-ant-design:zoom-out-outlined" size="small" :disabled="!src" @click="handlerToolbar('zoom', -0.1)" diff --git a/src/components/Upload/src/BasicUpload.vue b/src/components/Upload/src/BasicUpload.vue index ac65fdd..b6f0a18 100644 --- a/src/components/Upload/src/BasicUpload.vue +++ b/src/components/Upload/src/BasicUpload.vue @@ -70,7 +70,7 @@ function handlePreviewDelete(url: string) { <template> <div> <Space> - <a-button type="primary" pre-icon="carbon:cloud-upload" @click="openUploadModal"> + <a-button type="primary" pre-icon="i-carbon:cloud-upload" @click="openUploadModal"> {{ t('component.upload.upload') }} </a-button> <Tooltip v-if="showPreview" placement="bottom"> diff --git a/src/enums/appEnum.ts b/src/enums/appEnum.ts index 61534d4..84d6b66 100644 --- a/src/enums/appEnum.ts +++ b/src/enums/appEnum.ts @@ -52,22 +52,22 @@ export enum RouterTransitionEnum { } export enum IconEnum { - VIEW = 'ant-design:file-search-outlined', - ADD = 'ant-design:plus-outlined', - IMPORT = 'ant-design:vertical-align-top-outlined', - EXPORT = 'ant-design:vertical-align-bottom-outlined', - TEST = 'ant-design:deployment-unit-outlined', - EDIT = 'clarity:note-edit-line', - AUTH = 'ant-design:safety-certificate-outlined', - DELETE = 'ant-design:delete-outlined', - SEARCH = 'ant-design:search-outlined', - RESET = 'ant-design:sync-outlined', - UPLOAD = 'ant-design:cloud-upload-outlined', - DOWNLOAD = 'ant-design:cloud-download-outlined', - PREVIEW = 'ant-design:eye-outlined', - ADD_FOLD = 'ant-design:folder-add-outlined', - LOG = 'ant-design:exception-outlined', - PASSWORD = 'ant-design:key-outlined', - SETTING = 'ant-design:setting-outlined', - SEND = 'ant-design:send-outlined', + VIEW = 'i-ant-design:file-search-outlined', + ADD = 'i-ant-design:plus-outlined', + IMPORT = 'i-ant-design:vertical-align-top-outlined', + EXPORT = 'i-ant-design:vertical-align-bottom-outlined', + TEST = 'i-ant-design:deployment-unit-outlined', + EDIT = 'i-ant-design:edit-outlined', + AUTH = 'i-ant-design:safety-certificate-outlined', + DELETE = 'i-ant-design:delete-outlined', + SEARCH = 'i-ant-design:search-outlined', + RESET = 'i-ant-design:sync-outlined', + UPLOAD = 'i-ant-design:cloud-upload-outlined', + DOWNLOAD = 'i-ant-design:cloud-download-outlined', + PREVIEW = 'i-ant-design:eye-outlined', + ADD_FOLD = 'i-ant-design:folder-add-outlined', + LOG = 'i-ant-design:exception-outlined', + PASSWORD = 'i-ant-design:key-outlined', + SETTING = 'i-ant-design:setting-outlined', + SEND = 'i-ant-design:send-outlined', } diff --git a/src/layouts/default/tabs/useTabDropdown.ts b/src/layouts/default/tabs/useTabDropdown.ts index c0a426d..4030cc5 100644 --- a/src/layouts/default/tabs/useTabDropdown.ts +++ b/src/layouts/default/tabs/useTabDropdown.ts @@ -49,42 +49,43 @@ export function useTabDropdown(tabContentProps: TabContentProps, getIsTabs: Comp // Close right const closeRightDisabled = !isCurItem || (index === tabStore.getTabList.length - 1 && tabStore.getLastDragEndIndex >= 0) + // @unocss-include const dropMenuList: DropMenu[] = [ { - icon: 'ion:reload-sharp', + icon: 'i-ion:reload-sharp', event: MenuEventEnum.REFRESH_PAGE, text: t('layout.multipleTab.reload'), disabled: refreshDisabled, }, { - icon: 'clarity:close-line', + icon: 'i-clarity:close-line', event: MenuEventEnum.CLOSE_CURRENT, text: t('layout.multipleTab.close'), disabled: !!meta?.affix || disabled, divider: true, }, { - icon: 'line-md:arrow-close-left', + icon: 'i-line-md:arrow-close-left', event: MenuEventEnum.CLOSE_LEFT, text: t('layout.multipleTab.closeLeft'), disabled: closeLeftDisabled, divider: false, }, { - icon: 'line-md:arrow-close-right', + icon: 'i-line-md:arrow-close-right', event: MenuEventEnum.CLOSE_RIGHT, text: t('layout.multipleTab.closeRight'), disabled: closeRightDisabled, divider: true, }, { - icon: 'dashicons:align-center', + icon: 'i-dashicons:align-center', event: MenuEventEnum.CLOSE_OTHER, text: t('layout.multipleTab.closeOther'), disabled: disabled || !isCurItem, }, { - icon: 'clarity:minus-line', + icon: 'i-clarity:minus-line', event: MenuEventEnum.CLOSE_ALL, text: t('layout.multipleTab.closeAll'), disabled, diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index 1c9bc83..62ec538 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -64,7 +64,7 @@ export const ProfileRoute: AppRouteRecordRaw = { canTo: true, hidden: true, noTagsView: false, - icon: 'ant-design:user-outlined', + icon: 'i-ant-design:user-outlined', title: t('routes.basic.profile'), }, }, diff --git a/src/views/base/profile/BaseSetting.vue b/src/views/base/profile/BaseSetting.vue index 3c7bf5e..bb361b7 100644 --- a/src/views/base/profile/BaseSetting.vue +++ b/src/views/base/profile/BaseSetting.vue @@ -61,7 +61,7 @@ async function handleSubmit() { <CropperAvatar :value="avatar" btn-text="更换头像" - :btn-props="{ preIcon: 'ant-design:cloud-upload-outlined' }" + :btn-props="{ preIcon: 'i-ant-design:cloud-upload-outlined' }" width="150" class="mb-4 block rounded-full" @change="updateAvatar" diff --git a/src/views/system/notify/my/index.vue b/src/views/system/notify/my/index.vue index 8b62377..fdb4dc0 100644 --- a/src/views/system/notify/my/index.vue +++ b/src/views/system/notify/my/index.vue @@ -88,10 +88,10 @@ function handleInfo(record: any) { <div> <BasicTable bordered @register="registerTable"> <template #toolbar> - <a-button pre-icon="solar:check-read-line-duotone" type="primary" :disabled="readedDisabled" @click="handleUpdateList"> + <a-button pre-icon="i-solar:check-read-line-duotone" type="primary" :disabled="readedDisabled" @click="handleUpdateList"> 标记已读 </a-button> - <a-button pre-icon="solar:check-read-linear" type="primary" @click="handleUpdateAll"> + <a-button pre-icon="i-solar:check-read-linear" type="primary" @click="handleUpdateAll"> 全部已读 </a-button> </template>