xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
chenchun
2024-06-26 12:46:51 +08:00
parent b30662d2b4 5db4fea3b5
commit ca200c81b3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs
View File

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

4
Yi.RuoYi.Vue3/src/components/DictTag/index.vue
View File

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

2
Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue
View File

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