github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-26 08:36:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename the Icon component to IconifyIcon to prevent name conflicts and fix type issues (#4704)

Browse Source
This commit is contained in:
Vben
2024-10-21 20:14:25 +08:00
committed by GitHub
parent 88d2b3e569
commit 1b172b0329
16 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue
View File

@@ -1,7 +1,7 @@
<script setup lang="ts">
import { type Component, computed } from 'vue';
import { Icon, IconDefault } from '@vben-core/icons';
import { IconDefault, IconifyIcon } from '@vben-core/icons';
import {
isFunction,
isHttpUrl,
@@ -28,6 +28,6 @@ const isComponent = computed(() => {
<template>
<component :is="icon as Component" v-if="isComponent" v-bind="$attrs" />
<img v-else-if="isRemoteIcon" :src="icon as string" v-bind="$attrs" />
<Icon v-else-if="icon" v-bind="$attrs" :icon="icon as string" />
<IconifyIcon v-else-if="icon" v-bind="$attrs" :icon="icon as string" />
<IconDefault v-else-if="fallback" v-bind="$attrs" />
</template>