feat: 代码优化

mayfly_go_web/src/components/svgIcon/index.vue

@@ -1,11 +1,17 @@
 <template>
-	<i v-if="isEle" class="el-icon" :style="setIconSvgStyle">
-		<component :is="getIconName" />
-	</i>
-	<div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
-		<img :src="getIconName" :style="setIconSvgInsStyle" />
-	</div>
-	<i v-else :class="getIconName" :style="setIconSvgStyle" />
+    <i v-if="isShowIconSvg" class="el-icon icon-middle" :style="setIconSvgStyle">
+        <component :is="getIconName" :style="setIconSvgStyle" />
+    </i>
+
+    <svg v-else-if="isIconfont()" class="el-icon iconfont-icon icon-middle" aria-hidden="true" :style="setIconSvgStyle">
+        <use :xlink:href="'#' + getIconfontName()"></use>
+    </svg>
+
+    <div v-else-if="isShowIconImg" :style="setIconImgOutStyle">
+        <img :src="getIconName" :style="setIconSvgInsStyle" />
+    </div>
+
+    <i v-else :class="getIconName" :style="setIconSvgStyle" />
 </template>
 
 <script setup lang="ts" name="svgIcon">
@@ -13,19 +19,19 @@ import { computed } from 'vue';
 
 // 定义父组件传过来的值
 const props = defineProps({
-	// svg 图标组件名字
-	name: {
-		type: String,
-	},
-	// svg 大小
-	size: {
-		type: Number,
-		default: () => 14,
-	},
-	// svg 颜色
-	color: {
-		type: String,
-	},
+    // svg 图标组件名字
+    name: {
+        type: String,
+    },
+    // svg 大小
+    size: {
+        type: Number,
+        default: () => 14,
+    },
+    // svg 颜色
+    color: {
+        type: String,
+    },
     isEle: {
         type: Boolean,
         default: true,
@@ -33,35 +39,67 @@ const props = defineProps({
 });
 
 // 在线链接、本地引入地址前缀
-// https://gitee.com/lyt-top/vue-next-admin/issues/I62OVL
 const linesString = ['https', 'http', '/src', '/assets', 'data:image', import.meta.env.VITE_PUBLIC_PATH];
 
 // 获取 icon 图标名称
 const getIconName = computed(() => {
-	return props?.name;
+    return props?.name as any;
 });
-// 用于判断 element plus 自带 svg 图标的显示、隐藏
+
+// 用于判断 element plus 自带 svg 图标的显示、隐藏。不存在 空格分隔的icon name即为element plus自带icon
 const isShowIconSvg = computed(() => {
-	return props?.name?.startsWith('ele-');
+    const ss = props?.name?.split(" ")
+    if (!ss) {
+        return true;
+    }
+    return ss.length == 1;
 });
+
+const isIconfont = () => {
+    return props?.name?.startsWith("iconfont")
+}
+
+const getIconfontName = () => {
+    // iconfont icon-xxxx 获取icon-xxx即可
+    return props?.name?.split(" ")[1]
+}
+
 // 用于判断在线链接、本地引入等图标显示、隐藏
 const isShowIconImg = computed(() => {
-	return linesString.find((str) => props.name?.startsWith(str));
+    return linesString.find((str) => props.name?.startsWith(str));
 });
+
 // 设置图标样式
 const setIconSvgStyle = computed(() => {
-	return `font-size: ${props.size}px;color: ${props.color};`;
+    return `font-size: ${props.size}px;color: ${props.color};width: ${props.size}px;height: ${props.size}px;`;
 });
+
 // 设置图片样式
 const setIconImgOutStyle = computed(() => {
-	return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
+    return `width: ${props.size}px;height: ${props.size}px;display: inline-block;overflow: hidden;`;
 });
+
 // 设置图片样式
-// https://gitee.com/lyt-top/vue-next-admin/issues/I59ND0
 const setIconSvgInsStyle = computed(() => {
-	const filterStyle: string[] = [];
-	const compatibles: string[] = ['-webkit', '-ms', '-o', '-moz'];
-	compatibles.forEach((j) => filterStyle.push(`${j}-filter: drop-shadow(${props.color} 30px 0);`));
-	return `width: ${props.size}px;height: ${props.size}px;position: relative;left: -${props.size}px;${filterStyle.join('')}`;
+    const filterStyle: string[] = [];
+    const compatibles: string[] = ['-webkit', '-ms', '-o', '-moz'];
+    compatibles.forEach((j) => filterStyle.push(`${j}-filter: drop-shadow(${props.color} 30px 0);`));
+    return `width: ${props.size}px;height: ${props.size}px;position: relative;left: -${props.size}px;${filterStyle.join('')}`;
 });
-</script>
+</script>
+
+<style type="text/css">
+.iconfont-icon {
+    vertical-align: -0.15em;
+    fill: currentColor;
+    overflow: hidden;
+}
+
+.icon-middle {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    vertical-align: middle;
+}
+</style>