Merge branch 'abp' of https://gitee.com/ccnetcore/Yi into abp

This commit is contained in:
chenchun
2024-06-26 12:46:51 +08:00
3 changed files with 5 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -16,7 +16,7 @@ namespace Yi.Framework.Core.Helper
public static List<string> ImageType { get; set; } = new List<string>
{
".jpg",".png",".jpge"
".jpg",".png",".jpeg"
};
private static Hashtable _mimeMappingTable;

View File

@@ -3,7 +3,7 @@
<template v-for="(item, index) in options">
<template v-if="values.includes(item.value)">
<span
v-if="item.elTagType == 'default' || item.elTagType == ''"
v-if="item.elTagType == 'default' || item.elTagType == ''|| item.elTagType == null"
:key="item.value"
:index="index"
:class="item.elTagClass"
@@ -13,7 +13,7 @@
:disable-transitions="true"
:key="item.value + ''"
:index="index"
:type="item.elTagType === 'primary' ? '' : item.elTagType"
:type="item.elTagType"
:class="item.elTagClass"
>{{ item.label }}</el-tag>
</template>

View File

@@ -1,5 +1,5 @@
<template>
<transition-group name="fade-transform" mode="out-in">
<transition-group name="fade-transform">
<inner-link
v-for="(item, index) in tagsViewStore.iframeViews"
:key="item.path"