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

Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/MimeHelper.cs

@@ -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;

Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BankManager.cs

@@ -70,23 +70,12 @@ namespace Yi.Framework.Bbs.Domain.Managers
         /// <returns></returns>
         private async Task<InterestRecordsAggregateRoot> CreateInterestRecordsAsync()
         {
-            //获取最新的实体
-            var lastEntity = await _interestRepository._DbQueryable.OrderByDescending(x => x.CreationTime).FirstAsync();
             decimal oldValue = DefalutRate;
 
-
-
             var thirdPartyValue = await _bankValueProvider.GetValueAsync();
             //获取实际值的变化率
             decimal changeRate = (thirdPartyValue - _bankValueProvider.StandardValue) / (thirdPartyValue);
 
-
-            //说明不是第一次
-            if (lastEntity is not null)
-            {
-                oldValue = lastEntity.Value;
-            }
-
             //判断市场是否波动
             bool isFluctuate = IsMarketVolatility();
             //市场波动
@@ -98,7 +87,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
             //根据上一次的老值进行变化率比较
             var currentValue = oldValue + (oldValue * changeRate);
 
-            var entity = new InterestRecordsAggregateRoot(thirdPartyValue, currentValue);
+            var entity = new InterestRecordsAggregateRoot(thirdPartyValue, currentValue, isFluctuate);
             var output = await _interestRepository.InsertReturnEntityAsync(entity);
 
             return output;

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs

@@ -134,7 +134,7 @@ namespace Yi.Framework.Rbac.Application.Services.System
         /// <param name="input"></param>
         /// <returns></returns>
         [OperLog("更新用户", OperEnum.Update)]
-        [Permission("system:user:update")]
+        [Permission("system:user:edit")]
         public async override Task<UserGetOutputDto> UpdateAsync(Guid id, UserUpdateInputVo input)
         {
             if (input.UserName == UserConst.Admin || input.UserName == UserConst.TenantAdmin)

Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/MenuDataSeed.cs

@@ -1,4 +1,4 @@
-using Volo.Abp.Data;
+using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Yi.Framework.Rbac.Domain.Entities;
@@ -718,6 +718,19 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
             entities.Add(userRemove);
 
 
+             MenuAggregateRoot userResetPwd = new MenuAggregateRoot(_guidGenerator.Create())
+            {
+
+                MenuName = "重置密码",
+                PermissionCode = "system:user:resetPwd",
+                MenuType = MenuTypeEnum.Component,
+                OrderNum = 100,
+                ParentId = user.Id,
+                IsDeleted = false
+            };
+            entities.Add(userResetPwd);
+
+
             //角色管理
             MenuAggregateRoot role = new MenuAggregateRoot(_guidGenerator.Create())
             {

Yi.RuoYi.Vue3/src/components/DictTag/index.vue

@@ -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>

Yi.RuoYi.Vue3/src/layout/components/IframeToggle/index.vue

@@ -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"

Yi.RuoYi.Vue3/src/layout/components/Sidebar/SidebarItem.vue

@@ -9,7 +9,7 @@
       </app-link>
     </template>
 
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta && item.meta.icon" />
         <span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>